diff options
author | Angelo Naselli <anaselli@linux.it> | 2016-01-01 16:41:57 +0100 |
---|---|---|
committer | Angelo Naselli <anaselli@linux.it> | 2016-01-01 16:41:57 +0100 |
commit | bd52d8fa9689c8e8dd164618bfe489a003037866 (patch) | |
tree | 5d64501af64676d16b1c8bd7176b5457f14da19e /lib/ManaTools/Module | |
parent | 6a54e267dd03c20d8c8229929037a2cd0853a6a5 (diff) | |
download | manatools-bd52d8fa9689c8e8dd164618bfe489a003037866.tar manatools-bd52d8fa9689c8e8dd164618bfe489a003037866.tar.gz manatools-bd52d8fa9689c8e8dd164618bfe489a003037866.tar.bz2 manatools-bd52d8fa9689c8e8dd164618bfe489a003037866.tar.xz manatools-bd52d8fa9689c8e8dd164618bfe489a003037866.zip |
Restored Icon and Title behaviour or they were missed in mpan,
using Shared::GUI::Dialog solves this problem
Diffstat (limited to 'lib/ManaTools/Module')
-rw-r--r-- | lib/ManaTools/Module/DisplayManager.pm | 6 | ||||
-rw-r--r-- | lib/ManaTools/Module/Firewall.pm | 13 | ||||
-rw-r--r-- | lib/ManaTools/Module/Hosts.pm | 5 | ||||
-rw-r--r-- | lib/ManaTools/Module/LogViewer.pm | 6 | ||||
-rw-r--r-- | lib/ManaTools/Module/Proxy.pm | 6 | ||||
-rw-r--r-- | lib/ManaTools/Module/Services.pm | 6 | ||||
-rw-r--r-- | lib/ManaTools/Module/Users.pm | 9 |
7 files changed, 47 insertions, 4 deletions
diff --git a/lib/ManaTools/Module/DisplayManager.pm b/lib/ManaTools/Module/DisplayManager.pm index b2f4338a..701e0941 100644 --- a/lib/ManaTools/Module/DisplayManager.pm +++ b/lib/ManaTools/Module/DisplayManager.pm @@ -180,6 +180,12 @@ sub _manageProxyDialog { ## set new title to get it in dialog my $newTitle = $self->loc->N("Display Manager"); + ## TODO remove title and icon when using Shared::Module::GUI::Dialog + ## set new title to get it in dialog + yui::YUI::app()->setApplicationTitle($newTitle); + ## set icon if not already set by external launcher + yui::YUI::app()->setApplicationIcon($self->icon()); + my $factory = yui::YUI::widgetFactory; my $optional = yui::YUI::optionalWidgetFactory; diff --git a/lib/ManaTools/Module/Firewall.pm b/lib/ManaTools/Module/Firewall.pm index a5081a82..a5407e59 100644 --- a/lib/ManaTools/Module/Firewall.pm +++ b/lib/ManaTools/Module/Firewall.pm @@ -518,6 +518,12 @@ sub ask_WatchedServices { ## set new title to get it in dialog yui::YUI::app()->setApplicationTitle($dlg_data->{title}); + ## TODO remove title and icon when using Shared::Module::GUI::Dialog + ## set new title to get it in dialog + yui::YUI::app()->setApplicationTitle($dlg_data->{title}); + ## set icon if not already set by external launcher + yui::YUI::app()->setApplicationIcon($dlg_data->{icon}); + my $factory = yui::YUI::widgetFactory; my $optional = yui::YUI::optionalWidgetFactory; @@ -722,6 +728,13 @@ sub ask_AllowedServices { $self->dialog($factory->createMainDialog()); my $layout = $factory->createVBox($self->dialog); + ## TODO remove title and icon when using Shared::Module::GUI::Dialog + ## set new title to get it in dialog + yui::YUI::app()->setApplicationTitle($dlg_data->{title}); + ## set icon if not already set by external launcher + yui::YUI::app()->setApplicationIcon($dlg_data->{icon}); + + my $hbox_header = $factory->createHBox($layout); my $headLeft = $factory->createHBox($factory->createLeft($hbox_header)); my $headRight = $factory->createHBox($factory->createRight($hbox_header)); diff --git a/lib/ManaTools/Module/Hosts.pm b/lib/ManaTools/Module/Hosts.pm index 47a2bc1d..131542ee 100644 --- a/lib/ManaTools/Module/Hosts.pm +++ b/lib/ManaTools/Module/Hosts.pm @@ -399,6 +399,11 @@ sub _manageHostsDialog { my $factory = yui::YUI::widgetFactory; my $optional = yui::YUI::optionalWidgetFactory; +## TODO remove title and icon when using Shared::Module::GUI::Dialog + ## set new title to get it in dialog + yui::YUI::app()->setApplicationTitle($self->name()); + ## set icon if not already set by external launcher + yui::YUI::app()->setApplicationIcon($self->icon()); $self->dialog($factory->createMainDialog()); my $layout = $factory->createVBox($self->dialog); diff --git a/lib/ManaTools/Module/LogViewer.pm b/lib/ManaTools/Module/LogViewer.pm index 9b74c44c..bc845fe4 100644 --- a/lib/ManaTools/Module/LogViewer.pm +++ b/lib/ManaTools/Module/LogViewer.pm @@ -141,6 +141,12 @@ sub _logViewerPanel { my $appTitle = yui::YUI::app()->applicationTitle(); + ## TODO remove title and icon when using Shared::Module::GUI::Dialog + ## set new title to get it in dialog + yui::YUI::app()->setApplicationTitle($self->name()); + ## set icon if not already set by external launcher + yui::YUI::app()->setApplicationIcon($self->icon()); + my $factory = yui::YUI::widgetFactory; my $optFactory = yui::YUI::optionalWidgetFactory; diff --git a/lib/ManaTools/Module/Proxy.pm b/lib/ManaTools/Module/Proxy.pm index edacbcec..277e096f 100644 --- a/lib/ManaTools/Module/Proxy.pm +++ b/lib/ManaTools/Module/Proxy.pm @@ -234,6 +234,12 @@ sub _manageProxyDialog { ## set new title to get it in dialog my $newTitle = $self->loc->N("Proxies configuration"); + ## TODO remove title and icon when using Shared::Module::GUI::Dialog + ## set new title to get it in dialog + yui::YUI::app()->setApplicationTitle($self->name()); + ## set icon if not already set by external launcher + yui::YUI::app()->setApplicationIcon($self->icon()); + my $factory = yui::YUI::widgetFactory; my $optional = yui::YUI::optionalWidgetFactory; diff --git a/lib/ManaTools/Module/Services.pm b/lib/ManaTools/Module/Services.pm index 700ee285..ca41582c 100644 --- a/lib/ManaTools/Module/Services.pm +++ b/lib/ManaTools/Module/Services.pm @@ -342,6 +342,12 @@ sub _servicePanel { my $appTitle = yui::YUI::app()->applicationTitle(); + ## TODO remove title and icon when using Shared::Module::GUI::Dialog + ## set new title to get it in dialog + yui::YUI::app()->setApplicationTitle($self->name()); + ## set icon if not already set by external launcher + yui::YUI::app()->setApplicationIcon($self->icon()); + my $mageiaPlugin = "mga"; my $factory = yui::YUI::widgetFactory; my $mgaFactory = yui::YExternalWidgets::externalWidgetFactory($mageiaPlugin); diff --git a/lib/ManaTools/Module/Users.pm b/lib/ManaTools/Module/Users.pm index 85cf6074..81b6108c 100644 --- a/lib/ManaTools/Module/Users.pm +++ b/lib/ManaTools/Module/Users.pm @@ -2433,10 +2433,11 @@ sub _manageUsersDialog { ## push application title my $appTitle = yui::YUI::app()->applicationTitle(); -# ## set new title to get it in dialog -# yui::YUI::app()->setApplicationTitle($self->name); -# ## set icon if not already set by external launcher -# yui::YUI::app()->setApplicationIcon($self->icon); + ## TODO remove title and icon when using Shared::Module::GUI::Dialog + ## set new title to get it in dialog + yui::YUI::app()->setApplicationTitle($self->name()); + ## set icon if not already set by external launcher + yui::YUI::app()->setApplicationIcon($self->icon()); my $factory = yui::YUI::widgetFactory; |