summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--perl-install/Makefile.drakxtools3
-rw-r--r--perl-install/diskdrake/hd_gtk.pm2
-rw-r--r--perl-install/drakxtools.spec1
-rw-r--r--perl-install/my_gtk.pm3
-rw-r--r--perl-install/share/wizard.rc172
5 files changed, 2 insertions, 179 deletions
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools
index 50aeb9733..b7a9ce831 100644
--- a/perl-install/Makefile.drakxtools
+++ b/perl-install/Makefile.drakxtools
@@ -39,8 +39,7 @@ install:
install -m 644 network/*.pm $(NETLIBDEST)
install -m 644 security/*.pm $(SECURITYDEST)
install -m 644 pixmaps/* $(PIXDIR)
- install -m 644 share/diskdrake.rc $(ETCDEST)
- install -m 644 share/wizard.rc $(ETCDEST)
+ install -m 644 share/diskdrake.rc $(DATADIR)/$(NAME)
install -d $(PREFIX)/etc/security
echo 'RESTRICT=yes' > $(PREFIX)/etc/security/fileshare.conf
diff --git a/perl-install/diskdrake/hd_gtk.pm b/perl-install/diskdrake/hd_gtk.pm
index 0755d9b42..9c783159c 100644
--- a/perl-install/diskdrake/hd_gtk.pm
+++ b/perl-install/diskdrake/hd_gtk.pm
@@ -52,7 +52,7 @@ sub main {
local $in->{grab} = 1;
$w = my_gtk->new('DiskDrake');
- my $rc = "/etc/gtk/diskdrake.rc";
+ my $rc = "/usr/share/libDrakX/diskdrake.rc";
-r $rc or $rc = dirname(__FILE__) . "/../diskdrake.rc";
-r $rc or $rc = dirname(__FILE__) . "/../share/diskdrake.rc";
Gtk::Rc->parse($rc);
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index 598ec9a44..b11e51b12 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -175,7 +175,6 @@ done
%files -f %{name}-gtk.list
%defattr(-,root,root)
-%config(noreplace) /etc/gtk/*.rc
%config(noreplace) %{_sysconfdir}/pam.d/net_monitor
%config(noreplace) %{_sysconfdir}/security/console.apps/net_monitor
/usr/X11R6/bin/*
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 9df203842..0c777d519 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -42,9 +42,6 @@ sub new {
$o->{rwindow}->set_modal(1) if $my_gtk::grab || $o->{grab};
if ($::isWizard && !$my_gtk::pop_it) {
- #- my $rc = "/etc/gtk/wizard.rc";
- #- -r $rc or $rc = dirname(__FILE__) . "/wizard.rc";
- #- Gtk::Rc->parse($rc);
$o->{window} = new Gtk::VBox(0,0);
$o->{window}->set_border_width($::Wizard_splash ? 0 : 10);
$o->{rwindow} = $o->{window};
diff --git a/perl-install/share/wizard.rc b/perl-install/share/wizard.rc
deleted file mode 100644
index cad898c2a..000000000
--- a/perl-install/share/wizard.rc
+++ /dev/null
@@ -1,172 +0,0 @@
-style "button"
-{
- bg[NORMAL] = "#909090"
-}
-
-style "window"
-{
-}
-
-style "any"
-{
- base[NORMAL] = { 0.2, 0.2, 0.4 }
- bg[NORMAL] = { 0.2, 0.2, 0.4 }
- bg[INSENSITIVE] = { 0.6, 0.6, 0.8 }
- base[INSENSITIVE]={ 0.6, 0.6, 0.8 }
- bg[ACTIVE] = { 0.6, 0.6, 0.8 }
- bg[PRELIGHT] = { 0.4, 0.4, 0.6 }
-
- text[NORMAL] = { 1.0, 1.0, 1.0 }
- fg[NORMAL] = { 1.0, 1.0, 1.0 }
- fg[INSENSITIVE] = { 0.0, 0.0, 0.0 }
- text[INSENSITIVE]={ 1.0, 1.0, 1.0 }
- fg[ACTIVE] = { 0.8, 0.8, 1.0 }
- fg[PRELIGHT] = { 1.0, 1.0, 1.0 }
-
- bg[SELECTED] = { 1.0, 1.0, 1.0 }
- fg[SELECTED] = { 0.2, 0.2, 0.4 }
-}
-
-style "entry"
-{
- base[NORMAL] = { 0.4, 0.4, 0.6 }
- base[ACTIVE] = { 0.4, 0.4, 0.6 }
- fg[NORMAL] = { 1.0, 1.0, 1.0 }
-}
-
-style "notebook"
-{
- bg[NORMAL] = { 0.4, 0.4, 0.6 }
- bg[ACTIVE] = { 0.2, 0.2, 0.4 }
- fg[NORMAL] = { 1.0, 1.0, 1.0 }
-}
-
-style "button" = "any"
-{
- bg[NORMAL] = { 0.4, 0.4, 0.6 }
- fg[NORMAL] = { 1.0, 1.0, 1.0 }
- bg[PRELIGHT] = { 0.36, 0.36, 0.56 }
- fg[PRELIGHT] = { 0.8, 0.8, 1.0 }
-}
-
-style "background"
-{
- bg[NORMAL] = { 0.6, 0.6, 0.8 }
- bg[PRELIGHT] = { 0.8, 0.8, 0.99 }
-}
-
-widget_class "GtkWindow" style "window"
-widget_class "*" style "any"
-widget_class "*GtkSpin*" style "entry"
-widget_class "*GtkEntry*" style "entry"
-widget_class "*Gtk*List*" style "entry"
-widget_class "*GtkCTree*" style "entry"
-widget_class "*GtkNotebook*" style "notebook"
-widget "*GtkButton" style "button"
-widget "*background*" style "background"
-
-
-# style "font"
-# {
-# fontset = "-*-*-medium-r-normal-*-8-*-*-*-*-*-iso8859-1,*-r-*"
-# }
-
-# style "any"
-# {
-# bg[NORMAL] = { 0.7, 0.8, 0.2 }
-# bg[PRELIGHT] = { 0.9, 0.9, 0.9 }
-# }
-
-# # style "any"
-# # {
-# # # fontset = "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1"
-# # bg[NORMAL] = { 1.0, 1.0, 1.0 }
-# # bg[SELECTED] = { 0.0, 0.8, 0.3 }
-# # bg[INSENSITIVE] = { 1.0, 1.0, 1.0 }
-# # bg[ACTIVE] = { 1.0, 1.0, 1.0 }
-# # bg[PRELIGHT] = { 1.0, 1.0, 1.0 }
-
-# # base[NORMAL] = { 1.0, 1.0, 1.0 }
-# # base[SELECTED] = { 1.0, 1.0, 1.0 }
-# # base[INSENSITIVE] = { 1.0, 1.0, 1.0 }
-# # base[ACTIVE] = { 1.0, 1.0, 1.0 }
-# # base[PRELIGHT] = { 1.0, 1.0, 1.0 }
-
-# # text[NORMAL] = { 0.0, 0.0, 0.0 }
-# # text[SELECTED] = { 0.0, 0.0, 0.0 }
-# # text[INSENSITIVE] = { 0.0, 0.0, 0.0 }
-# # text[ACTIVE] = { 0.0, 0.0, 0.0 }
-# # text[PRELIGHT] = { 0.0, 0.0, 0.0 }
-
-# # fg[NORMAL] = { 0.0, 0.0, 0.0 }
-# # fg[SELECTED] = { 0.8, 0.8, 0.8 }
-# # fg[INSENSITIVE] = { 1.0, 1.0, 0.0 }
-# # fg[ACTIVE] = { 1.0, 1.0, 0.0 }
-# # fg[PRELIGHT] = { 0.0, 0.3, 0.8 }
-
-# # }
-
-# style "area" = "font"
-# {
-# bg[NORMAL] = { 1.0, 1.0, 1.0 }
-# bg[PRELIGHT] = { 0.8, 0.8, 0.8 }
-# }
-
-# style "red" = "font"
-# {
-# bg[NORMAL] = { 1.0, 0, 0 }
-# bg[PRELIGHT] = { 0.9, 0, 0 }
-# }
-# style "darkred" = "font"
-# {
-# bg[NORMAL] = { 0.7, 0, 0 }
-# bg[PRELIGHT] = { 0.6, 0, 0 }
-# }
-# style "green" = "font"
-# {
-# bg[NORMAL] = { 0, 1.0, 0 }
-# bg[PRELIGHT] = { 0, 0.9, 0 }
-# fg[NORMAL] = { 0, 0, 0 }
-# }
-# style "blue" = "font"
-# {
-# bg[NORMAL] = { 0, 0, 1.0 }
-# bg[PRELIGHT] = { 0, 0, 0.9 }
-# }
-# style "white" = "font"
-# {
-# bg[NORMAL] = { 1.0, 1.0, 1.0 }
-# bg[PRELIGHT] = { 0.67, 0.67, 0.67 }
-# fg[NORMAL] = { 0, 0, 0 }
-# }
-
-# #widget_class "GtkWindow" style "window"
-# #widget_class "*abel*" style "any"
-# widget_class "*" style "any"
-# widget_class "*Area*" style "area"
-# #widget_class "*GtkSpin*" style "entry"
-# #widget_class "*GtkEntry*" style "entry"
-# #widget_class "*Gtk*List*" style "entry"
-# #widget_class "*GtkCTree*" style "entry"
-# #widget_class "*GtkNotebook*" style "notebook"
-# #widget "*GtkButton" style "button"
-# #widget "*background*" style "background"
-
-# #class "GtkRadioButton" style "checkradiobutton"
-# #class "GtkCheckButton" style "checkradiobutton"
-
-
-# #widget_class "GtkWindow" style "window"
-# #widget_class "*Area*" style "any"
-# #widget_class "*abel*" style "any"
-# #class "*" style "any"
-# #widget_class "*GtkSpin*" style "entry"
-# #widget_class "*GtkEntry*" style "entry"
-# #widget_class "*Gtk*List*" style "entry"
-# #widget_class "*GtkCTree*" style "entry"
-# #widget_class "*GtkNotebook*" style "notebook"
-# #widget "*GtkButton" style "button"
-# #widget "*background*" style "background"
-
-# #class "GtkRadioButton" style "checkradiobutton"
-# #class "GtkCheckButton" style "checkradiobutton"
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-12 19:41:19 +0000