diff --git a/source/ublexec.cc b/source/ublexec.cc index 01d53a3..6a254ee 100644 --- a/source/ublexec.cc +++ b/source/ublexec.cc @@ -87,7 +87,6 @@ void MainWindow::get_builder(){ builder->get_widget("iconSystem", iconSystem); builder->get_widget("lblSystem", lblSystem); builder->get_widget("lblHeaderName", lblHeaderName); - builder->get_widget("popInfo", popInfo); builder->get_widget("btnSynopsis", btnSynopsis); builder->get_widget("btnAbout", btnAbout); builder->get_widget("aboutWindows", aboutWindows); @@ -186,9 +185,8 @@ void MainWindow::event(){ iconOther->signal_selection_changed().connect(sigc::mem_fun(*this,&MainWindow::select_Other)); iconDevelopment->signal_selection_changed().connect(sigc::mem_fun(*this,&MainWindow::select_Development)); iconSystem->signal_selection_changed().connect(sigc::mem_fun(*this,&MainWindow::select_System)); - btnSynopsis->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show)); - btnAbout->signal_clicked().connect([&](){aboutWindows->show();}); - btnSettings->signal_clicked().connect([&](){popInfo->show();}); + btnSynopsis->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show)); + btnAbout->signal_activate().connect([&](){aboutWindows->show();}); } void MainWindow::synopsis_show(){ diff --git a/source/ublexec.h b/source/ublexec.h index cda2475..a6b3f50 100644 --- a/source/ublexec.h +++ b/source/ublexec.h @@ -169,9 +169,8 @@ public: Gtk::IconView *iconDevelopment; Gtk::IconView *iconSystem; Gtk::IconView *iconEntry; - Gtk::Popover *popInfo; - Gtk::ModelButton *btnAbout; - Gtk::ModelButton *btnSynopsis; + Gtk::MenuItem *btnAbout; + Gtk::MenuItem *btnSynopsis; Gtk::AboutDialog *aboutWindows; Gtk::MenuButton *btnSettings; Gtk::ButtonBox *btnBoxAboutDialog; diff --git a/style.css b/style.css index 41a96a0..1e38d36 100644 --- a/style.css +++ b/style.css @@ -4,4 +4,72 @@ .textHead{ text-shadow: 1px 1px #ffffff; } +.menuitemtop *{ + margin:2px 2px 0 2px; + padding: 5px 10px 3px 5px; +} +.menuitemmiddle *{ + margin:0 2px 0 2px; + padding: 3px 10px 3px 5px; +} +.menuitembottom *{ + margin:0 2px 2px 2px; + padding: 3px 10px 5px 5px; +} +.menuitemtop:hover { + background:@theme_bg_color; +} +.menuitemmiddle:hover { + background:@theme_bg_color; +} +.menuitembottom:hover { + background:@theme_bg_color; +} +.menuitemtop:hover* { + margin:2px 2px 0 2px; + padding: 5px 10px 3px 5px; + background:@theme_selected_bg_color; + border-radius:2px; + border-color:transparent; +} +.menuitemmiddle:hover* { + margin:0 2px 0 2px; + padding: 3px 10px 3px 5px; + background:@theme_selected_bg_color; + border-radius:2px; + border-color:transparent; +} +.menuitembottom:hover* { + margin:0 2px 2px 2px; + padding: 3px 10px 5px 5px; + background:@theme_selected_bg_color; + border-radius:2px; + border-color:transparent; +} +.menuitembottom{ + margin-top:0px; + border-color:alpha(@theme_text_color, 0.4); + border-style:solid; + border-radius:0 0 5px 5px; + border-left-width:1px; + border-bottom-width:1px; + border-right-width:1px; +} +.menuitemmiddle{ + margin-top:0px; + margin-bottom:0px; + border-color:alpha(@theme_text_color, 0.4); + border-style:solid; + border-left-width:1px; + border-right-width:1px; +} +.menuitemtop{ + margin-bottom:0px; + border-color:alpha(@theme_text_color, 0.4); + border-style:solid; + border-radius:5px 5px 0 0; + border-left-width:1px; + border-top-width:1px; + border-right-width:1px; +} \ No newline at end of file diff --git a/ublexec.glade b/ublexec.glade index 3eff964..d4a0946 100644 --- a/ublexec.glade +++ b/ublexec.glade @@ -944,115 +944,33 @@ - + + True False - Внимание! - dialog - - + False + False + 4 + dropdown-menu + + + True False - vertical - 2 - - - False - True - end - - - - - - ОК - True - True - True - - - True - True - 1 - - - - - False - False - 0 - - - - - True - False - 10 - 10 - 15 - Select an executable file or program - - - True - True - 2 - - + Synopsis + True + - - - False - + True False - 0 - none - - - True - False - 5 - 5 - 5 - 5 - - - True - False - vertical - - - True - True - True - Synopsis - - - False - True - 2 - - - - - True - True - True - About the program - - - False - True - 3 - - - - - - - - - + About the program + True + @@ -1826,6 +1744,9 @@ specified priority True False Ublexec + + + @@ -1847,10 +1768,14 @@ specified priority False True True + menu1 none - popInfo - + + True + False + open-menu-symbolic + @@ -1865,15 +1790,58 @@ specified priority 1 - - - True + + + + + False + Внимание! + dialog + + + False + vertical + 2 + + False + True + end + + + ОК + True + True + True + + + True + True + 1 + + + False + False + 0 + + + + + True + False + 10 + 10 + 15 + Select an executable file or program + + + True + True 2