diff options
| -rwxr-xr-x | control-center | 15 | ||||
| -rw-r--r-- | drakconf.spec | 17 | ||||
| -rw-r--r-- | pixmaps/Makefile | 2 |
3 files changed, 20 insertions, 14 deletions
diff --git a/control-center b/control-center index c1a9f24e..456ccb98 100755 --- a/control-center +++ b/control-center @@ -22,6 +22,7 @@ my $_xbindir = "/usr/X11R6/bin"; my $_bindir = "/usr/bin"; my $_sbindir = "/usr/sbin"; my $mcc_dir = "/usr/share/mcc"; +my $themes_dir = "$mcc_dir/themes/"; my $_wizdir = "/usr/share/wizards"; BEGIN { !$ENV{DISPLAY} and exec ("$_sbindir/drakxconf; reset") } @@ -55,10 +56,10 @@ defined $h{LOGS} or do { if ($class{CLASS} eq 'expert') {$h{LOGS} = bool2text(0) my ($embedded, $logs) = (text2bool($h{EMBEDDED}), text2bool($h{LOGS})); my $theme = $h{THEME}; if ("@ARGV" =~ /--theme (\w+)/) { $theme = $1 } --d "$mcc_dir/$theme" or $theme = 'default'; +-d "$themes_dir/$theme" or $theme = 'default'; #"@ARGV" =~ /--safe/ and $theme = 'default'; -ugtk::add_icon_path("$mcc_dir/$theme"); -($theme ne 'default') and ugtk::add_icon_path("$mcc_dir/default"); +ugtk::add_icon_path("$themes_dir/$theme"); +($theme ne 'default') and ugtk::add_icon_path("$themes_dir/default"); my $window_splash = new Gtk::Window -popup; $window_splash->signal_connect (delete_event => \&quit_global); $window_splash->set_title(_("Mandrake Control Center")); @@ -66,7 +67,7 @@ $window_splash->set_policy(0, 0, 1); $window_splash->set_position(1); $window_splash->add( gtkadd(gtkset_shadow_type(new Gtk::Frame(), 'etched_out'), - -r "$mcc_dir/$theme/splash_screen.png" ? gtkpng("splash_screen") : new Gtk::Label(_("Loading... Please wait"))) + -r "$themes_dir/$theme/splash_screen.png" ? gtkpng("splash_screen") : new Gtk::Label(_("Loading... Please wait"))) ); $window_splash->show_all; Gtk->main_iteration while Gtk->events_pending; @@ -746,7 +747,7 @@ sub about_mdk_cc { $clist->set_column_justification(0, "right"); gtkpack_($window_about->vbox, - -r "$mcc_dir/$theme/splash_screen_about.png" ? + -r "$themes_dir/$theme/splash_screen_about.png" ? (0, gtkpng("splash_screen_about")) : (1, gtksetstyle(new Gtk::Label(_("Mandrake Control Center %s\n", $_version)), $style1),), 0, new Gtk::Label(''), 0, new Gtk::Label(_("Copyright (C) 2001 Mandrakesoft SA")), @@ -781,7 +782,7 @@ sub get_main_menu { my ($window) = @_; my $accel_group = new Gtk::AccelGroup(); my $item_factory = new Gtk::ItemFactory('Gtk::MenuBar', '<main>', $accel_group); - my @theme_list = grep { -d "$mcc_dir/$_" } all($mcc_dir); + my @theme_list = grep { -d "$themes_dir/$_" } all($themes_dir); $item_factory->create_items( ( { path => _("/_File"), @@ -799,7 +800,7 @@ sub get_main_menu { { path => _("/Options")._("/_Embedded Mode"), callback => sub { $embedded = $embedded_check_box->active }, type => '<ToggleItem>'}, - if_(all($mcc_dir) > 1, + if_(all($themes_dir) > 1, { path => _("/_Themes"), type => '<Branch>' }, (map { my $l = $_; diff --git a/drakconf.spec b/drakconf.spec index fc7abae8..5b497cb2 100644 --- a/drakconf.spec +++ b/drakconf.spec @@ -6,7 +6,7 @@ Summary: The Mandrake Control Center Name: drakconf Version: %version -Release: 0.14mdk +Release: 0.15mdk # get the source from our cvs repository (see # http://www.linuxmandrake.com/en/cvs.php3) Source0: %name-%version.tar.bz2 @@ -94,17 +94,22 @@ rm -rf $RPM_BUILD_ROOT %_liconsdir/*.png %dir %_datadir/mcc %_datadir/mcc/desktop -%_datadir/mcc/default +%_datadir/mcc/themes/default %files themes %defattr(-,root,root) %doc COPYING -%_datadir/mcc/gnome -%_datadir/mcc/kde +%_datadir/mcc/themes/gnome +%_datadir/mcc/themes/kde %changelog -* Tue Aug 27 2002 Daouda LO <daouda@mandrakesoft.com> 9.0-0.14mdk -- added drakxconf back (updates apps) +* Tue Aug 27 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.0-0.15mdk +- added drakxconf back (updates apps) (daouda) + +* Tue Aug 27 2002 Thierry Vignaud <tvignaud@mandrakesoft.com> 9.0-0.14mdk +- move themes from %_datadir/mcc to %_datadir/mcc/themes since fred + has added gnome files in the directory we put themes, thus making a + bogus "desktop" them appears in menu * Mon Aug 26 2002 Daouda LO <daouda@mandrakesoft.com> 9.0-0.13mdk - remove CHLD wait signal handler which prevent non perl-Gtk programs diff --git a/pixmaps/Makefile b/pixmaps/Makefile index f0f259de..6df1cf21 100644 --- a/pixmaps/Makefile +++ b/pixmaps/Makefile @@ -1,5 +1,5 @@ THEMES = default kde gnome -mcc_dir = $(DESTDIR)/usr/share/mcc +mcc_dir = $(DESTDIR)/usr/share/mcc/themes all: |