Commit 0c432a7c authored by Fabien Parent's avatar Fabien Parent
Browse files

Remove Quit, Preferences, About entries from menubar

parent 3ebb5e17
......@@ -160,9 +160,6 @@ Controller::Controller()
save_file (false),
save_all (false),
undo (false),
preferences (true),
quit (true),
about (true),
find_files (false),
find_matches (false),
next_file (false),
......@@ -200,13 +197,11 @@ void Controller::load_xml(const Glib::RefPtr<Gtk::Builder>& xml)
{
save_file .add_widgets(xml, "menuitem_save", "button_save");
save_all .add_widgets(xml, "menuitem_save_all", "button_save_all");
quit .add_widgets(xml, "menuitem_quit", "button_quit");
undo .add_widgets(xml, "menuitem_undo", "button_undo");
cut .add_widgets(xml, "menuitem_cut", 0);
copy .add_widgets(xml, "menuitem_copy", 0);
paste .add_widgets(xml, "menuitem_paste", 0);
erase .add_widgets(xml, "menuitem_delete", 0);
preferences .add_widgets(xml, "menuitem_preferences", 0);
next_file .add_widgets(xml, "menuitem_next_file", "button_next_file");
prev_file .add_widgets(xml, "menuitem_prev_file", "button_prev_file");
next_match .add_widgets(xml, "menuitem_next_match", "button_next_match");
......@@ -216,7 +211,6 @@ void Controller::load_xml(const Glib::RefPtr<Gtk::Builder>& xml)
replace_all .add_widgets(xml, "menuitem_replace_all", "button_replace_all");
find_files .add_widgets(xml, 0, "button_find_files");
find_matches.add_widgets(xml, 0, "button_find_matches");
about .add_widgets(xml, "menuitem_about", 0);
}
} // namespace Regexxer
......@@ -98,9 +98,6 @@ public:
ControlItem save_file;
ControlItem save_all;
ControlItem undo;
ControlItem preferences;
ControlItem quit;
ControlItem about;
ControlItem find_files;
ControlItem find_matches;
......
......@@ -406,9 +406,6 @@ void MainWindow::connect_signals()
controller_.copy .connect(mem_fun(*this, &MainWindow::on_copy));
controller_.paste .connect(mem_fun(*this, &MainWindow::on_paste));
controller_.erase .connect(mem_fun(*this, &MainWindow::on_erase));
controller_.preferences .connect(mem_fun(*this, &MainWindow::on_preferences));
controller_.quit .connect(mem_fun(*this, &MainWindow::on_quit));
controller_.about .connect(mem_fun(*this, &MainWindow::on_about));
controller_.find_files .connect(mem_fun(*this, &MainWindow::on_find_files));
controller_.find_matches.connect(mem_fun(*this, &MainWindow::on_exec_search));
controller_.next_file .connect(bind(mem_fun(*this, &MainWindow::on_go_next_file), true));
......
......@@ -52,24 +52,6 @@
<property name="accel_group">mainwindow_accelgroup</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="menuitem_separator1">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="menuitem_quit">
<property name="label">gtk-quit</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">mainwindow_accelgroup</property>
<accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
</object>
</child>
</object>
......@@ -149,23 +131,6 @@
<property name="accel_group">mainwindow_accelgroup</property>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem" id="menuitem_separator3">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem" id="menuitem_preferences">
<property name="label">gtk-preferences</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">mainwindow_accelgroup</property>
</object>
</child>
</object>
</child>
</object>
......@@ -272,31 +237,6 @@
</child>
</object>
</child>
<child>
<object class="GtkMenuItem" id="menuitem_help">
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="menuitem_help_menu">
<property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem" id="menuitem_about">
<property name="label">gtk-about</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="accel_group">mainwindow_accelgroup</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment