LADI
/
ladish
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove messages window

This commit is contained in:
Nedko Arnaudov 2009-07-29 02:18:44 +03:00
parent 2df73f5e7f
commit 7274c16805
3 changed files with 3 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
gui/Patchage.cpp
View File

@ -44,8 +44,8 @@
Patchage * g_app;
//#define LOG_TO_STD
#define LOG_TO_STATUS
#define LOG_TO_STD
//#define LOG_TO_STATUS
using namespace std;
@ -102,16 +102,11 @@ Patchage::Patchage(int argc, char** argv)
, INIT_WIDGET(_menu_close_all_projects)
, INIT_WIDGET(_menu_store_positions)
, INIT_WIDGET(_menu_view_arrange)
, INIT_WIDGET(_menu_view_messages)
, INIT_WIDGET(_menu_view_projects)
, INIT_WIDGET(_menu_view_refresh)
, INIT_WIDGET(_menu_view_toolbar)
, INIT_WIDGET(_messages_clear_but)
, INIT_WIDGET(_messages_close_but)
, INIT_WIDGET(_messages_win)
, INIT_WIDGET(_project_list_viewport)
, INIT_WIDGET(_sample_rate_label)
, INIT_WIDGET(_status_text)
, INIT_WIDGET(_toolbar)
, INIT_WIDGET(_zoom_full_but)
, INIT_WIDGET(_zoom_normal_but)
@ -178,20 +173,11 @@ Patchage::Patchage(int argc, char** argv)
sigc::mem_fun(this, &Patchage::on_arrange));
_menu_view_toolbar->signal_activate().connect(
sigc::mem_fun(this, &Patchage::on_view_toolbar));
_menu_view_messages->signal_toggled().connect(
sigc::mem_fun(this, &Patchage::on_show_messages));
_menu_view_projects->signal_toggled().connect(
sigc::mem_fun(this, &Patchage::on_show_projects));
_menu_help_about->signal_activate().connect(
sigc::mem_fun(this, &Patchage::on_help_about));
_messages_clear_but->signal_clicked().connect(
sigc::mem_fun(this, &Patchage::on_messages_clear));
_messages_close_but->signal_clicked().connect(
sigc::mem_fun(this, &Patchage::on_messages_close));
_messages_win->signal_delete_event().connect(
sigc::mem_fun(this, &Patchage::on_messages_delete));
_canvas->show();
_main_win->present();
@ -252,7 +238,6 @@ Patchage::~Patchage()
delete _a2j;
_about_win.destroy();
_messages_win.destroy();
//_main_win.destroy();
patchage_dbus_uninit();
@ -389,11 +374,6 @@ Patchage::info_msg(const std::string& msg)
void
Patchage::status_msg(const string& msg)
{
if (_status_text->get_buffer()->size() > 0)
_status_text->get_buffer()->insert(_status_text->get_buffer()->end(), "\n");
_status_text->get_buffer()->insert(_status_text->get_buffer()->end(), msg);
_status_text->scroll_to_mark(_status_text->get_buffer()->get_insert(), 0);
}
@ -454,47 +434,12 @@ Patchage::on_help_about()
}
void
Patchage::on_messages_clear()
{
_status_text->get_buffer()->erase(
_status_text->get_buffer()->begin(),
_status_text->get_buffer()->end());
}
void
Patchage::on_messages_close()
{
_menu_view_messages->set_active(false);
}
bool
Patchage::on_messages_delete(GdkEventAny*)
{
_menu_view_messages->set_active(false);
return true;
}
void
Patchage::on_quit()
{
_main_win->hide();
}
void
Patchage::on_show_messages()
{
if (_menu_view_messages->get_active())
_messages_win->present();
else
_messages_win->hide();
}
void
Patchage::on_show_projects()
{

9
gui/Patchage.hpp
View File

@ -109,11 +109,7 @@ protected:
void on_arrange();
void on_help_about();
void on_messages_clear();
void on_messages_close();
bool on_messages_delete(GdkEventAny*);
void on_quit();
void on_show_messages();
void on_show_projects();
void on_store_positions();
void on_view_toolbar();
@ -171,16 +167,11 @@ protected:
Widget<Gtk::MenuItem> _menu_close_all_projects;
Widget<Gtk::MenuItem> _menu_store_positions;
Widget<Gtk::MenuItem> _menu_view_arrange;
Widget<Gtk::CheckMenuItem> _menu_view_messages;
Widget<Gtk::CheckMenuItem> _menu_view_projects;
Widget<Gtk::MenuItem> _menu_view_refresh;
Widget<Gtk::CheckMenuItem> _menu_view_toolbar;
Widget<Gtk::Button> _messages_clear_but;
Widget<Gtk::Button> _messages_close_but;
Widget<Gtk::Dialog> _messages_win;
Widget<Gtk::Viewport> _project_list_viewport;
Widget<Gtk::Label> _sample_rate_label;
Widget<Gtk::TextView> _status_text;
Widget<Gtk::Toolbar> _toolbar;
Widget<Gtk::ToolButton> _zoom_full_but;
Widget<Gtk::ToolButton> _zoom_normal_but;

92
gui/gui.glade
View File

@ -4,7 +4,7 @@
<glade-interface>
<widget class="GtkWindow" id="main_win">
<property name="border_width">1</property>
<property name="title" translatable="yes">Patchage</property>
<property name="title" translatable="yes">LADI Session Handler</property>
<child>
<widget class="GtkVBox" id="main_vbox">
<property name="visible">True</property>
@ -205,16 +205,6 @@
<accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
</widget>
</child>
<child>
<widget class="GtkCheckMenuItem" id="menu_view_messages">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">View log messages</property>
<property name="label" translatable="yes">_Messages</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_messages1_activate"/>
<accelerator key="M" modifiers="GDK_CONTROL_MASK" signal="activate"/>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_view_refresh">
<property name="visible">True</property>
@ -573,86 +563,6 @@ along with LADI Session Handler; if not, write to the Free Software Foundation,
</widget>
</child>
</widget>
<widget class="GtkDialog" id="messages_win">
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Patchage - Messages</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="spacing">2</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<child>
<widget class="GtkTextView" id="status_text">
<property name="width_request">640</property>
<property name="height_request">480</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
<property name="wrap_mode">GTK_WRAP_WORD</property>
<property name="cursor_visible">False</property>
<property name="accepts_tab">False</property>
</widget>
</child>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
<widget class="GtkButton" id="messages_clear_but">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">gtk-clear</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
</child>
<child>
<widget class="GtkButton" id="messages_close_but">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">gtk-close</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
</widget>
</child>
</widget>
<widget class="GtkDialog" id="load_project_dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>