diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/MachinaCanvas.cpp | 7 | ||||
| -rw-r--r-- | src/gui/MachinaCanvas.hpp | 2 | ||||
| -rw-r--r-- | src/gui/MachinaGUI.cpp | 12 | ||||
| -rw-r--r-- | src/gui/MachinaGUI.hpp | 1 | ||||
| -rw-r--r-- | src/gui/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gui/machina.glade | 6 | ||||
| -rw-r--r-- | src/gui/machina.svg (renamed from src/gui/machina-icon.svg) | 0 |
7 files changed, 7 insertions, 27 deletions
diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp index 1be5ef0..193a4c8 100644 --- a/src/gui/MachinaCanvas.cpp +++ b/src/gui/MachinaCanvas.cpp @@ -39,13 +39,6 @@ MachinaCanvas::MachinaCanvas(MachinaGUI* app, int width, int height) void -MachinaCanvas::status_message(const string& msg) -{ - _app->status_message(string("[Canvas] ").append(msg)); -} - - -void MachinaCanvas::node_clicked(WeakPtr<NodeView> item, GdkEventButton* event) { SharedPtr<NodeView> node = PtrCast<NodeView>(item.lock()); diff --git a/src/gui/MachinaCanvas.hpp b/src/gui/MachinaCanvas.hpp index 302ffa4..906a87c 100644 --- a/src/gui/MachinaCanvas.hpp +++ b/src/gui/MachinaCanvas.hpp @@ -40,8 +40,6 @@ public: void disconnect_node(SharedPtr<NodeView> port1, SharedPtr<NodeView> port2); - void status_message(const string& msg); - void build(SharedPtr<Machina::Machine> machine); protected: diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp index e1ba61f..c0a04a9 100644 --- a/src/gui/MachinaGUI.cpp +++ b/src/gui/MachinaGUI.cpp @@ -57,7 +57,6 @@ MachinaGUI::MachinaGUI(SharedPtr<Machina::Engine> engine) xml->get_widget("help_about_menuitem", _menu_help_about); xml->get_widget("help_help_menuitem", _menu_help_help); xml->get_widget("canvas_scrolledwindow", _canvas_scrolledwindow); - xml->get_widget("status_text", _status_text); xml->get_widget("slave_radiobutton", _slave_radiobutton); xml->get_widget("bpm_radiobutton", _bpm_radiobutton); xml->get_widget("bpm_spinbutton", _bpm_spinbutton); @@ -223,17 +222,6 @@ MachinaGUI::zoom(double z) } -void -MachinaGUI::status_message(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); -} - - /** Update the sensitivity status of menus to reflect the present. */ void diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp index 391884e..fe1c803 100644 --- a/src/gui/MachinaGUI.hpp +++ b/src/gui/MachinaGUI.hpp @@ -46,7 +46,6 @@ public: void attach(); void quit() { _main_window->hide(); } - void status_message(const string& msg); inline void queue_refresh() { _refresh = true; } protected: diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index bbe902e..fb74a41 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -3,10 +3,10 @@ AM_CXXFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_ EXTRA_DIST = machina.gladep sharefilesdir = $(pkgdatadir) -dist_sharefiles_DATA = machina.glade +dist_sharefiles_DATA = machina.glade machina.svg -#globalpixmapsdir = $(datadir)/pixmaps -#dist_globalpixmaps_DATA = machina-icon.svg +globalpixmapsdir = $(datadir)/pixmaps +dist_globalpixmaps_DATA = machina.svg machina_gui_SOURCES = \ main.cpp \ diff --git a/src/gui/machina.glade b/src/gui/machina.glade index 4002ba1..c57bb88 100644 --- a/src/gui/machina.glade +++ b/src/gui/machina.glade @@ -13,7 +13,7 @@ <property name="default_height">480</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> - <property name="icon">machina-icon.svg</property> + <property name="icon">machina.svg</property> <property name="decorated">True</property> <property name="skip_taskbar_hint">False</property> <property name="skip_pager_hint">False</property> @@ -629,7 +629,7 @@ along with Machina; if not, write to the Free Software Foundation, Inc., <property name="website_label" translatable="yes">Website:</property> <property name="authors">Dave Robillard <dave@drobilla.net></property> <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property> - <property name="logo">machina-icon.svg</property> + <property name="logo">machina.svg</property> </widget> <widget class="GtkDialog" id="help_dialog"> @@ -640,6 +640,7 @@ along with Machina; if not, write to the Free Software Foundation, Inc., <property name="modal">False</property> <property name="resizable">False</property> <property name="destroy_with_parent">False</property> + <property name="icon">machina.svg</property> <property name="icon_name">gtk-help</property> <property name="decorated">True</property> <property name="skip_taskbar_hint">False</property> @@ -726,6 +727,7 @@ Selector nodes are shown in green. <property name="modal">False</property> <property name="resizable">False</property> <property name="destroy_with_parent">False</property> + <property name="icon">machina.svg</property> <property name="decorated">True</property> <property name="skip_taskbar_hint">True</property> <property name="skip_pager_hint">True</property> diff --git a/src/gui/machina-icon.svg b/src/gui/machina.svg index 39f7be0..39f7be0 100644 --- a/src/gui/machina-icon.svg +++ b/src/gui/machina.svg |
