diff --git a/bin/qasim-gui.rb b/bin/qasim-gui.rb index a1a9eb4..3c41814 100755 --- a/bin/qasim-gui.rb +++ b/bin/qasim-gui.rb @@ -162,9 +162,7 @@ module Qasim act_about.setIconVisibleInMenu true act_about.setEnabled true act_about.connect(SIGNAL(:triggered)) do - puts "Show about dialog!" - dialog = Qasim::Ui::About.new - dialog.show + res = @about_dialog.show end @context_menu.addAction act_about; @@ -184,26 +182,30 @@ module Qasim def build_interface @app = Qt::Application.new(ARGV) - si = Qt::SystemTrayIcon.new + #Qt.debug_level = Qt::DebugLevel::High + #Qt.debug_level = Qt::DebugLevel::Extensive + @app.setQuitOnLastWindowClosed false + + @main_win = Qt::MainWindow.new + @systray = Qt::SystemTrayIcon.new @main_win + @about_dialog = Qasim::Ui::About.new @main_win std_icon = Qt::Icon.new( ":/qasim/qasim-icon" ) - #std_icon = Qt::Icon.new( File.join APP_ICON_PATH, "qasim.svg" ) - #std_icon = Qt::Icon.new alt_icon = Qt::Icon.new blinking = false - si.icon = std_icon - si.show + @systray.icon = std_icon + @systray.show - si.setToolTip("Qasim %s" % APP_VERSION); + @systray.setToolTip("Qasim %s" % APP_VERSION); build_map_menu build_context_menu - si.contextMenu = @context_menu + @systray.contextMenu = @context_menu - si.connect(SIGNAL('activated(QSystemTrayIcon::ActivationReason)')) do |reason| + @systray.connect(SIGNAL('activated(QSystemTrayIcon::ActivationReason)')) do |reason| case reason when Qt::SystemTrayIcon::Trigger then build_map_menu diff --git a/lib/qasim/ui/about.rb b/lib/qasim/ui/about.rb index 3a5bed7..9d646d8 100644 --- a/lib/qasim/ui/about.rb +++ b/lib/qasim/ui/about.rb @@ -50,7 +50,9 @@ module Qasim ; module Ui # FIXME handle error on licence reading end - #FIXME: set first tab + # set first tab + @ui.tab_widget.setCurrentIndex(0) end + end end ; end diff --git a/lib/qasim/ui/about.ui b/lib/qasim/ui/about.ui index f9bf9da..11b629e 100644 --- a/lib/qasim/ui/about.ui +++ b/lib/qasim/ui/about.ui @@ -6,8 +6,8 @@ 0 0 - 519 - 461 + 470 + 500 @@ -53,19 +53,7 @@ - - - true - - - - 400 - 300 - - - - - + 0 @@ -105,7 +93,7 @@ Authors - + @@ -182,17 +170,17 @@ p, li { white-space: pre-wrap; } button_box - accepted() + clicked(QAbstractButton*) About - close() + accept() - 259 - 441 + 463 + 493 - 259 - 230 + 469 + 12