remove the png so that it can theme.
2003-12-16 Jody Goldberg <jody@gnome.org> * capplets/file-types/file-types.desktop.in : remove the png so that it can theme. * capplets/desktop-links/Makefile.am : remove .in.in path kludge. * capplets/desktop-links/Accessibility.directory.in : * capplets/desktop-links/Advanced.directory.in : ditto. * capplets/background/Makefile.am : no need to install capplet icon anymore its part of the theme. * capplets/default-applications/Makefile.am : * capplets/font/Makefile.am : * capplets/keybindings/Makefile.am : * capplets/keyboard/Makefile.am : * capplets/mouse/Makefile.am : * capplets/network/Makefile.am : * capplets/sound/Makefile.am : * capplets/theme-switcher/Makefile.am : * capplets/ui-properties/Makefile.am : * capplets/windows/Makefile.am : * capplets/accessibility/at-properties/Makefile.am : * capplets/accessibility/keyboard/Makefile.am : * capplets/background/background.desktop.in : Use the themed icon. * capplets/default-applications/default-applications.desktop.in : * capplets/font/font-properties.desktop.in : * capplets/keybindings/keybinding.desktop.in : * capplets/keyboard/keyboard.desktop.in : * capplets/mouse/gnome-settings-mouse.desktop.in : * capplets/network/gnome-network-preferences.desktop.in : * capplets/sound/gnome-settings-sound.desktop.in : * capplets/theme-switcher/gtk-theme-selector.desktop.in : * capplets/ui-properties/gnome-ui-properties.desktop.in : * capplets/windows/window-properties.desktop.in : * capplets/accessibility/at-properties/at-properties.desktop.in : * capplets/accessibility/keyboard/accessibility-keyboard.desktop.in :
This commit is contained in:
Jody Goldberg
Jody Goldberg
parent
89f7333975
commit
95c1168292
51 changed files with 124 additions and 189 deletions
39
ChangeLog
39
ChangeLog
|
|
@ -1,3 +1,42 @@
|
|||
2003-12-16 Jody Goldberg <jody@gnome.org>
|
||||
|
||||
* capplets/file-types/file-types.desktop.in : remove the png so that
|
||||
it can theme.
|
||||
|
||||
* capplets/desktop-links/Makefile.am : remove .in.in path kludge.
|
||||
* capplets/desktop-links/Accessibility.directory.in :
|
||||
* capplets/desktop-links/Advanced.directory.in : ditto.
|
||||
|
||||
* capplets/background/Makefile.am : no need to install capplet icon
|
||||
anymore its part of the theme.
|
||||
* capplets/default-applications/Makefile.am :
|
||||
* capplets/font/Makefile.am :
|
||||
* capplets/keybindings/Makefile.am :
|
||||
* capplets/keyboard/Makefile.am :
|
||||
* capplets/mouse/Makefile.am :
|
||||
* capplets/network/Makefile.am :
|
||||
* capplets/sound/Makefile.am :
|
||||
* capplets/theme-switcher/Makefile.am :
|
||||
* capplets/ui-properties/Makefile.am :
|
||||
* capplets/windows/Makefile.am :
|
||||
|
||||
* capplets/accessibility/at-properties/Makefile.am :
|
||||
* capplets/accessibility/keyboard/Makefile.am :
|
||||
|
||||
* capplets/background/background.desktop.in : Use the themed icon.
|
||||
* capplets/default-applications/default-applications.desktop.in :
|
||||
* capplets/font/font-properties.desktop.in :
|
||||
* capplets/keybindings/keybinding.desktop.in :
|
||||
* capplets/keyboard/keyboard.desktop.in :
|
||||
* capplets/mouse/gnome-settings-mouse.desktop.in :
|
||||
* capplets/network/gnome-network-preferences.desktop.in :
|
||||
* capplets/sound/gnome-settings-sound.desktop.in :
|
||||
* capplets/theme-switcher/gtk-theme-selector.desktop.in :
|
||||
* capplets/ui-properties/gnome-ui-properties.desktop.in :
|
||||
* capplets/windows/window-properties.desktop.in :
|
||||
* capplets/accessibility/at-properties/at-properties.desktop.in :
|
||||
* capplets/accessibility/keyboard/accessibility-keyboard.desktop.in :
|
||||
|
||||
2003-12-09 Kaushal Kumar <kaushal.kumar@wipro.com>
|
||||
|
||||
* capplets/display/main.c (create_dialog):
|
||||
|
|
|
|||
4
NEWS
4
NEWS
|
|
@ -4,6 +4,10 @@ Jody:
|
|||
http://bugzilla.gnome.org/show_bug.cgi?id=125899
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=125970
|
||||
* Fix the build and configure on older X servers.
|
||||
* Use icon themes
|
||||
|
||||
Sergey:
|
||||
* Merge gswitchit into gnome-settings-daemon and keyboard capplet
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
gnome-control-center 2.5.0
|
||||
|
|
|
|||
22
README
22
README
|
|
@ -1,29 +1,10 @@
|
|||
GNOME Control Center
|
||||
====================
|
||||
Version: 2.1.4
|
||||
|
||||
GNOME Control Center for the GNOME 2.2 Beta Desktop contains the following -
|
||||
|
||||
gnome-accessibility-keyboard-properties
|
||||
gnome-background-properties
|
||||
gnome-default-applications-properties
|
||||
gnome-file-types-properties
|
||||
gnome-font-properties
|
||||
gnome-keybinding-properties
|
||||
gnome-keyboard-properties
|
||||
gnome-mouse-properties
|
||||
gnome-network-preferences
|
||||
gnome-sound-properties
|
||||
gnome-theme-manager
|
||||
gnome-ui-properties
|
||||
gnome-window-properties
|
||||
gnome-control-center
|
||||
gnome-settings-daemon
|
||||
|
||||
Requirements -
|
||||
|
||||
intltool >= 0.21
|
||||
gtk+ >= 2.0.0
|
||||
gtk+ >= 2.3.0
|
||||
gconf >= 2.0.0
|
||||
libgnome >= 2.0.0
|
||||
libgnomeui >= 2.0.0
|
||||
|
|
@ -32,6 +13,7 @@ Requirements -
|
|||
libbonoboui >= 2.0.0
|
||||
libgnomevfs >= 2.0.0
|
||||
gnome-desktop >= 2.0.0
|
||||
gnome-icon-theme >= 1.1.3
|
||||
|
||||
Installation -
|
||||
|
||||
|
|
|
|||
|
|
@ -9,22 +9,15 @@ gnome_at_properties_LDFLAGS = -export-dynamic
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
icons_DATA = at-enable-capplet.png
|
||||
|
||||
desktopdir = $(GNOMECC_DESKTOP_DIR)
|
||||
Desktop_in_files = at-properties.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmap_DATA = \
|
||||
at-enable-capplet.png \
|
||||
at-startup.png \
|
||||
at-support.png
|
||||
|
||||
desktop_iconsdir = $(datadir)/pixmaps
|
||||
desktop_icons_DATA = at-enable-capplet.png
|
||||
|
||||
gladedir = $(GNOMECC_GLADE_DIR)
|
||||
glade_DATA = at-enable-dialog.glade
|
||||
|
||||
|
|
@ -33,4 +26,4 @@ INCLUDES = $(AT_CAPPLET_CFLAGS) \
|
|||
-DGLADEDIR=\""$(gladedir)"\" \
|
||||
-DPIXMAPDIR=\""$(pixmapdir)"\"
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(icons_DATA) $(glade_DATA) $(pixmap_DATA) $(Desktop_in_files)
|
||||
EXTRA_DIST = $(glade_DATA) $(pixmap_DATA) $(Desktop_in_files)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Assistive Technology Support
|
||||
_Comment=Enable support for GNOME assistive technologies at login
|
||||
Exec=gnome-at-properties
|
||||
Icon=at-enable-capplet.png
|
||||
Icon=gnome-settings-accessibility-technologies
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
|
|
|
|||
|
|
@ -26,17 +26,11 @@ pixmap_DATA = \
|
|||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Glade_DATA = gnome-accessibility-keyboard-properties.glade
|
||||
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
icons_DATA = accessibility-keyboard-capplet.png
|
||||
|
||||
desktop_iconsdir = $(datadir)/pixmaps
|
||||
desktop_icons_DATA = accessibility-keyboard-capplet.png
|
||||
|
||||
desktopdir = $(GNOMECC_DESKTOP_DIR)
|
||||
Desktop_in_files = accessibility-keyboard.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA)
|
||||
EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmap_DATA)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Keyboard
|
||||
_Comment=Set your keyboard accessibility preferences
|
||||
Exec=gnome-accessibility-keyboard-properties
|
||||
Icon=accessibility-keyboard-capplet.png
|
||||
Icon=gnome-settings-accessibility-keyboard
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
|
|
|
|||
|
|
@ -8,17 +8,11 @@ gnome_background_properties_SOURCES = background-properties-capplet.c
|
|||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Glade_DATA = background-properties.glade
|
||||
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
icons_DATA = background-capplet.png
|
||||
|
||||
desktop_iconsdir = $(datadir)/pixmaps
|
||||
desktop_icons_DATA = background-capplet.png
|
||||
|
||||
desktopdir = $(GNOMECC_DESKTOP_DIR)
|
||||
Desktop_in_files = background.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -I$(top_srcdir)/libbackground
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files)
|
||||
EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 3.9 KiB |
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Background
|
||||
_Comment=Customize your desktop background
|
||||
Exec=gnome-background-properties
|
||||
Icon=background-capplet.png
|
||||
Icon=gnome-settings-background
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
|
|
|
|||
|
|
@ -6,12 +6,6 @@ gnome_default_applications_properties_SOURCES = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
icons_DATA = default-applications-capplet.png
|
||||
|
||||
desktop_iconsdir = $(datadir)/pixmaps
|
||||
desktop_icons_DATA = default-applications-capplet.png
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Glade_DATA = gnome-default-applications-properties.glade
|
||||
|
||||
|
|
@ -21,4 +15,4 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
|||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) gnome-default-applications-properties-structs.c
|
||||
EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) gnome-default-applications-properties-structs.c
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Preferred Applications
|
||||
_Comment=Select your default applications
|
||||
Exec=gnome-default-applications-properties
|
||||
Icon=default-applications-capplet.png
|
||||
Icon=gnome-settings-default-applications
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@
|
|||
_Name=Accessibility
|
||||
_Comment=Accessibility Settings
|
||||
Type=Directory
|
||||
Icon=accessibility-directory.png
|
||||
Icon=accessibility-directory
|
||||
|
|
@ -2,4 +2,4 @@
|
|||
_Name=Advanced
|
||||
_Comment=Advanced Settings
|
||||
Type=Directory
|
||||
Icon=advanced-directory.png
|
||||
Icon=advanced-directory
|
||||
|
|
@ -5,7 +5,7 @@ capplets =
|
|||
|
||||
pixmaps_pre = $(capplets:=-capplet.png)
|
||||
pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png
|
||||
pixmapsdir = $(GNOMECC_ICONS_DIR)
|
||||
pixmapsdir = $(datadir)/icons/gnome/48x48/apps
|
||||
|
||||
##
|
||||
## Desktop files
|
||||
|
|
@ -13,39 +13,22 @@ pixmapsdir = $(GNOMECC_ICONS_DIR)
|
|||
|
||||
desktop_files = $(capplets:=.desktop)
|
||||
desktop_in_files = $(desktop_files:.desktop=.desktop.in)
|
||||
desktop_in_in_files = $(desktop_files:.desktop=.desktop.in.in)
|
||||
|
||||
desktopfilesdir = $(GNOMECC_DESKTOP_DIR)
|
||||
desktopfiles_DATA = $(desktop_files)
|
||||
|
||||
CLEANFILES = $(desktop_files) $(desktop_in_files)
|
||||
EXTRA_DIST = $(desktop_in_in_files) $(groups_in_in_files) $(pixmaps_DATA)
|
||||
|
||||
%.desktop.in: $(srcdir)/%.desktop.in.in
|
||||
sed s#Icon=#Icon=$(GNOMECC_ICONS_DIR)/# < $< > $@
|
||||
EXTRA_DIST = $(desktop_in_files) $(groups_in_files) $(pixmaps_DATA)
|
||||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
all-local: $(desktop_files) $(groups_files)
|
||||
|
||||
|
||||
|
||||
## Create the .directory file
|
||||
##
|
||||
## foo.directory.in is created from foo.directory.in.in and substituting the Icon field with
|
||||
## the full path of the icon.
|
||||
## foo.directory.in is merged with the translations to create foo.directory
|
||||
## foo.directory is installed and renamed
|
||||
##
|
||||
groups = Advanced Accessibility
|
||||
groups_files = $(groups:=.directory)
|
||||
groups_in_files = $(groups_files:.directory=.directory.in)
|
||||
groups_in_in_files = $(groups_files:.directory=.directory.in.in)
|
||||
|
||||
Gnomeccdir = $(datadir)/gnome/vfolders
|
||||
Gnomecc_DATA = $(groups_files)
|
||||
|
||||
%.directory.in: $(srcdir)/%.directory.in.in
|
||||
sed s#Icon=#Icon=$(pixmapsdir)/# < $< > $@
|
||||
|
||||
@INTLTOOL_DIRECTORY_RULE@
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Encoding=UTF-8
|
||||
_Name=File types and programs
|
||||
_Comment=Specify which programs are used to open or view each type of file
|
||||
Icon=gnome-ccmime.png
|
||||
Icon=gnome-ccmime
|
||||
Exec=gnome-file-types-properties
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
|
|
|||
|
|
@ -7,9 +7,6 @@ gnome_font_properties_LDFLAGS = -export-dynamic
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
icons_DATA = font-capplet.png
|
||||
|
||||
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmap_DATA = \
|
||||
subpixel-rgb.png \
|
||||
|
|
@ -17,9 +14,6 @@ pixmap_DATA = \
|
|||
subpixel-vrgb.png \
|
||||
subpixel-vbgr.png
|
||||
|
||||
desktop_iconsdir = $(datadir)/pixmaps
|
||||
desktop_icons_DATA = font-capplet.png
|
||||
|
||||
desktopdir = $(GNOMECC_DESKTOP_DIR)
|
||||
Desktop_in_files = font-properties.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
|
@ -32,4 +26,4 @@ INCLUDES = $(FONT_CAPPLET_CFLAGS) \
|
|||
-DGLADEDIR=\""$(gladedir)"\" \
|
||||
-DPIXMAPDIR=\""$(pixmapdir)"\"
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(Desktop_in_files) $(icons_DATA) $(glade_DATA) $(pixmap_DATA)
|
||||
EXTRA_DIST = $(Desktop_in_files) $(glade_DATA) $(pixmap_DATA)
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 646 B |
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Font
|
||||
_Comment=Select fonts for the desktop
|
||||
Exec=gnome-font-properties
|
||||
Icon=font-capplet.png
|
||||
Icon=gnome-settings-font
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
|
|
|
|||
|
|
@ -10,18 +10,14 @@ gnome_keybinding_properties_SOURCES = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Glade_DATA = gnome-keybinding-properties.glade
|
||||
|
||||
pixmapsdir = $(datadir)/pixmaps
|
||||
pixmaps_DATA = keyboard-shortcut.png
|
||||
|
||||
desktopdir = $(GNOMECC_DESKTOP_DIR)
|
||||
Desktop_in_files = keybinding.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmaps_DATA)
|
||||
EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Keyboard Shortcuts
|
||||
_Comment=Assign shortcut keys to commands
|
||||
Exec=gnome-keybinding-properties
|
||||
Icon=keyboard-shortcut.png
|
||||
Icon=gnome-settings-keybindings
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB |
|
|
@ -14,20 +14,17 @@ gnome_keyboard_properties_LDADD = \
|
|||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Glade_DATA = gnome-keyboard-properties.glade
|
||||
|
||||
iconsdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
icons_DATA = keyboard-capplet.png \
|
||||
pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmaps_DATA = \
|
||||
keyboard-repeat.png \
|
||||
keyboard-cursor.png \
|
||||
keyboard-volume.png \
|
||||
keyboard-bell.png
|
||||
|
||||
pixmapsdir = $(datadir)/pixmaps
|
||||
pixmaps_DATA = keyboard-capplet.png
|
||||
|
||||
desktopdir = $(GNOMECC_DESKTOP_DIR)
|
||||
Desktop_in_files = keyboard.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBXKLAVIER_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files)
|
||||
EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA) $(Desktop_in_files)
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 KiB |
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Keyboard
|
||||
_Comment=Set your keyboard preferences
|
||||
Exec=gnome-keyboard-properties
|
||||
Icon=keyboard-capplet.png
|
||||
Icon=gnome-dev-keyboard
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@ Makefile.in
|
|||
*.lo
|
||||
*.la
|
||||
gnome-mouse-properties
|
||||
mouse.desktop
|
||||
gnome-settings-mouse.desktop
|
||||
|
|
|
|||
|
|
@ -27,16 +27,10 @@ cursorfont_DATA = \
|
|||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Glade_DATA = gnome-mouse-properties.glade
|
||||
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
icons_DATA = mouse-capplet.png
|
||||
|
||||
desktop_iconsdir = $(datadir)/pixmaps
|
||||
desktop_icons_DATA = mouse-capplet.png
|
||||
|
||||
desktopdir = $(GNOMECC_DESKTOP_DIR)
|
||||
Desktop_in_files = mouse.desktop.in
|
||||
Desktop_in_files = gnome-settings-mouse.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA)
|
||||
EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Mouse
|
||||
_Comment=Set your mouse preferences
|
||||
Exec=gnome-mouse-properties
|
||||
Icon=mouse-capplet.png
|
||||
Icon=gnome-dev-mouse-optical
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3 KiB |
|
|
@ -9,13 +9,10 @@ gnome_network_preferences_LDADD = \
|
|||
gladedir = $(GNOMECC_GLADE_DIR)
|
||||
glade_DATA = gnome-network-preferences.glade
|
||||
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
icons_DATA = gnome-network-capplet.png
|
||||
|
||||
desktopdir = $(GNOMECC_DESKTOP_DIR)
|
||||
desktop_in_files = gnome-network-preferences.desktop.in
|
||||
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(glade_DATA) $(icons_DATA) $(desktop_in_files)
|
||||
EXTRA_DIST = $(glade_DATA) $(desktop_in_files)
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 4 KiB |
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Network Proxy
|
||||
_Comment=Network proxy preferences
|
||||
Exec=gnome-network-preferences
|
||||
Icon=gnome-globe.png
|
||||
Icon=gnome-globe
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@ Makefile.in
|
|||
*.la
|
||||
*.o
|
||||
gnome-sound-properties
|
||||
sound.desktop
|
||||
gnome-settings-sound.desktop
|
||||
|
|
|
|||
|
|
@ -8,17 +8,13 @@ gnome_sound_properties_SOURCES = sound-properties-capplet.c
|
|||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Glade_DATA = sound-properties.glade
|
||||
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
icons_DATA = sound-capplet.png
|
||||
|
||||
desktop_iconsdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
desktop_icons_DATA = sound-capplet.png visual-bell.png
|
||||
desktop_icons_DATA = visual-bell.png
|
||||
|
||||
desktopdir = $(GNOMECC_DESKTOP_DIR)
|
||||
Desktop_in_files = sound.desktop.in
|
||||
Desktop_in_files = gnome-settings-sound.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(SOUND_CAPPLET_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(Glade_DATA) $(desktop_icons_DATA) $(Desktop_in_files)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Sound
|
||||
_Comment=Enable sound and associate sounds with events
|
||||
Exec=gnome-sound-properties
|
||||
Icon=gnome-audio.png
|
||||
Icon=gnome-settings-sound
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.5 KiB |
|
|
@ -4,9 +4,6 @@ pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
|||
pixmap_DATA = \
|
||||
theme-thumbnailing.png
|
||||
|
||||
desktop_iconsdir = $(datadir)/pixmaps
|
||||
desktop_icons_DATA = gnome-ccthemes.png
|
||||
|
||||
gnome_theme_manager_LDADD = \
|
||||
$(GNOMECC_CAPPLETS_LIBS) \
|
||||
$(METACITY_LIBS) \
|
||||
|
|
@ -42,4 +39,4 @@ INCLUDES = \
|
|||
-DGLADEDIR=\""$(gladedir)"\"
|
||||
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(Desktop_in_files) $(glade_DATA) gnome-theme-save-data.c $(pixmap_DATA) $(desktop_icons_DATA)
|
||||
EXTRA_DIST = $(Desktop_in_files) $(glade_DATA) gnome-theme-save-data.c $(pixmap_DATA)
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Theme
|
||||
_Comment=Select themes for various parts of the desktop
|
||||
Exec=gnome-theme-manager
|
||||
Icon=gnome-ccthemes.png
|
||||
Icon=gnome-settings-theme
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
|
|
|
|||
|
|
@ -6,4 +6,4 @@ Makefile.in
|
|||
*.la
|
||||
*.o
|
||||
gnome-ui-properties
|
||||
behavior.desktop
|
||||
gnome-ui-properties.desktop
|
||||
|
|
|
|||
|
|
@ -6,17 +6,13 @@ gnome_ui_properties_SOURCES = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
icons_DATA = behavior-capplet.png
|
||||
|
||||
desktop_iconsdir = $(datadir)/pixmaps
|
||||
desktop_icons_DATA = behavior-capplet.png
|
||||
|
||||
desktopdir = $(GNOMECC_DESKTOP_DIR)
|
||||
Desktop_in_files = behavior.desktop.in
|
||||
Desktop_in_files = gnome-ui-properties.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
||||
Gladedir = $(GNOMECC_GLADE_DIR)
|
||||
Glade_DATA = gnome-ui-properties.glade
|
||||
|
||||
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files)
|
||||
EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 KiB |
|
|
@ -1,7 +0,0 @@
|
|||
[Desktop Entry]
|
||||
_Name=Behavior
|
||||
_Comment=Sets the default behavior of GNOME applications
|
||||
Exec=ui-properties
|
||||
Icon=gnome-applications.png
|
||||
Terminal=0
|
||||
Type=Application
|
||||
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Menus & Toolbars
|
||||
_Comment=Customize the appearance of toolbars and menubars in applications
|
||||
Exec=gnome-ui-properties
|
||||
Icon=behavior-capplet.png
|
||||
Icon=gnome-settings-ui-behavior
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
|
|
@ -8,18 +8,9 @@ gnome_window_properties_SOURCES = \
|
|||
|
||||
@INTLTOOL_DESKTOP_RULE@
|
||||
|
||||
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
|
||||
pixmap_DATA =
|
||||
|
||||
gladedir = $(GNOMECC_GLADE_DIR)
|
||||
glade_DATA = gnome-window-properties.glade
|
||||
|
||||
iconsdir = $(GNOMECC_ICONS_DIR)
|
||||
icons_DATA = window-capplet.png
|
||||
|
||||
desktop_iconsdir = $(datadir)/pixmaps
|
||||
desktop_icons_DATA = window-capplet.png
|
||||
|
||||
desktopdir = $(GNOMECC_DESKTOP_DIR)
|
||||
Desktop_in_files = window-properties.desktop.in
|
||||
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
|
||||
|
|
@ -31,5 +22,5 @@ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \
|
|||
-DPIXMAPDIR=\""$(pixmapdir)"\"
|
||||
|
||||
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
|
||||
EXTRA_DIST = $(glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA)
|
||||
EXTRA_DIST = $(glade_DATA) $(Desktop_in_files)
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 3 KiB |
|
|
@ -3,7 +3,7 @@ Encoding=UTF-8
|
|||
_Name=Windows
|
||||
_Comment=Window Properties
|
||||
Exec=gnome-window-properties
|
||||
Icon=window-capplet.png
|
||||
Icon=gnome-window-manager
|
||||
Terminal=false
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
|
|
|
|||
|
|
@ -7,3 +7,5 @@ Makefile
|
|||
gnome-control-center
|
||||
gnomecc.desktop
|
||||
Gnome.directory
|
||||
GNOME_ControlCenter.server
|
||||
GNOME_ControlCenter.server.in
|
||||
|
|
|
|||
|
|
@ -1,3 +1,14 @@
|
|||
2003-12-15 Jody Goldberg <jody@gnome.org>
|
||||
|
||||
* gnomecc.desktop.in : Use themed icon
|
||||
* capplet-dir.c (find_icon) : Support icon themes
|
||||
* capplet-dir-view-list.c (list_create) : make icons wider and less
|
||||
ugly.
|
||||
|
||||
2003-12-12 Jody Goldberg <jody@gnome.org>
|
||||
|
||||
* gnomecc.desktop.in : Move to themeable icon
|
||||
|
||||
2003-10-28 Jody Goldberg <jody@gnome.org>
|
||||
|
||||
* Release 2.5.0
|
||||
|
|
|
|||
|
|
@ -489,7 +489,7 @@ list_create (CappletDirView *view)
|
|||
|
||||
adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw));
|
||||
|
||||
w = gnome_icon_list_new (72, NULL, 0);
|
||||
w = gnome_icon_list_new (100, NULL, 0);
|
||||
data->gil = GNOME_ICON_LIST (w);
|
||||
|
||||
title = g_build_filename (ART_DIR, "title.png", NULL);
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* -*- mode: c; style: linux -*- */
|
||||
/* vim: set sw=8: -*- mode: c; style: linux -*- */
|
||||
|
||||
/* capplet-dir.c
|
||||
* Copyright (C) 2000, 2001 Ximian, Inc.
|
||||
|
|
@ -53,43 +53,33 @@ CappletDirView *(*get_view_cb) (CappletDir *dir, CappletDirView *launcher);
|
|||
|
||||
/* nice global table for capplet lookup */
|
||||
GHashTable *capplet_hash = NULL;
|
||||
static GnomeIconTheme *icon_theme = NULL;
|
||||
|
||||
static char *
|
||||
find_icon (const char *icon, GnomeDesktopItem *dentry)
|
||||
find_icon (GnomeDesktopItem *dentry)
|
||||
{
|
||||
char *icon_file = NULL;
|
||||
char const *icon;
|
||||
|
||||
if (icon && icon[0]) {
|
||||
if (icon_theme == NULL)
|
||||
icon_theme = gnome_icon_theme_new ();
|
||||
|
||||
icon = gnome_desktop_item_get_string (dentry, GNOME_DESKTOP_ITEM_ICON);
|
||||
|
||||
if (icon == NULL || icon[0] == 0)
|
||||
icon_file = gnome_icon_theme_lookup_icon (icon_theme, "gnome-settings", 48, NULL, NULL);
|
||||
else if (g_path_is_absolute (icon))
|
||||
icon_file = g_strdup (icon);
|
||||
}
|
||||
|
||||
if (icon_file) {
|
||||
if (icon_file[0] != '/')
|
||||
{
|
||||
gchar *old = icon_file;
|
||||
icon_file = g_build_filename (GNOMECC_ICONS_DIR, old, NULL);
|
||||
g_free (old);
|
||||
}
|
||||
if (!g_file_test (icon_file, G_FILE_TEST_EXISTS) || g_file_test(icon_file, G_FILE_TEST_IS_DIR))
|
||||
{
|
||||
const gchar *icon;
|
||||
g_free (icon_file);
|
||||
icon = gnome_desktop_item_get_string (dentry, GNOME_DESKTOP_ITEM_ICON);
|
||||
if (icon)
|
||||
icon_file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, icon, TRUE, NULL);
|
||||
|
||||
if (!icon_file)
|
||||
icon_file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "gnome-unknown.png", TRUE, NULL);
|
||||
}
|
||||
} else {
|
||||
icon_file = gnome_program_locate_file
|
||||
(gnome_program_get (), GNOME_FILE_DOMAIN_APP_PIXMAP,
|
||||
"control-center2.png", TRUE, NULL);
|
||||
}
|
||||
else
|
||||
icon_file = gnome_icon_theme_lookup_icon (icon_theme, icon, 48, NULL, NULL);
|
||||
|
||||
if (!icon_file) { /* if icon_file still NULL */
|
||||
icon_file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "gnome-unknown.png", TRUE, NULL);
|
||||
}
|
||||
if (icon_file == NULL)
|
||||
icon_file = gnome_icon_theme_lookup_icon (icon_theme, "gnome-unknown", 48, NULL, NULL);
|
||||
|
||||
g_return_val_if_fail (icon_file != NULL, NULL);
|
||||
|
||||
if (!g_file_test (icon_file, G_FILE_TEST_EXISTS) || g_file_test(icon_file, G_FILE_TEST_IS_DIR))
|
||||
return NULL;
|
||||
|
||||
return icon_file;
|
||||
}
|
||||
|
|
@ -138,7 +128,7 @@ capplet_new (CappletDir *dir, gchar *desktop_path)
|
|||
|
||||
entry->label = g_strdup (gnome_desktop_item_get_localestring (dentry,
|
||||
GNOME_DESKTOP_ITEM_NAME));
|
||||
entry->icon = find_icon (gnome_desktop_item_get_string (dentry, GNOME_DESKTOP_ITEM_ICON), dentry);
|
||||
entry->icon = find_icon (dentry);
|
||||
entry->pb = gdk_pixbuf_new_from_file (entry->icon, NULL);
|
||||
entry->uri = gnome_vfs_uri_new (desktop_path);
|
||||
entry->exec = vec;
|
||||
|
|
@ -187,9 +177,7 @@ capplet_dir_new (CappletDir *dir, gchar *dir_path)
|
|||
entry->label = g_strdup (gnome_desktop_item_get_localestring (
|
||||
entry->entry,
|
||||
GNOME_DESKTOP_ITEM_NAME));
|
||||
entry->icon = find_icon (gnome_desktop_item_get_string (entry->entry,
|
||||
GNOME_DESKTOP_ITEM_ICON),
|
||||
entry->entry);
|
||||
entry->icon = find_icon (entry->entry);
|
||||
|
||||
if (!entry->icon)
|
||||
entry->icon = gnome_program_locate_file
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
Encoding=UTF-8
|
||||
_Name=GNOME Control Center
|
||||
_Comment=The GNOME configuration tool
|
||||
Icon=control-center2.png
|
||||
Icon=control-center2
|
||||
Exec=gnome-control-center
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue