From adfdf199013acf2ae83731efe76e6ce4352e16b4 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 6 Apr 2007 03:35:03 +0000 Subject: Icon fixes. git-svn-id: http://svn.drobilla.net/lad/machina@402 a436a847-0d15-0410-975c-d299462d15a1 --- src/Makefile.am | 3 -- src/gui/MachinaCanvas.cpp | 7 ----- src/gui/MachinaCanvas.hpp | 2 -- src/gui/MachinaGUI.cpp | 12 -------- src/gui/MachinaGUI.hpp | 1 - src/gui/Makefile.am | 6 ++-- src/gui/machina-icon.svg | 66 -------------------------------------------- src/gui/machina.glade | 6 ++-- src/gui/machina.svg | 66 ++++++++++++++++++++++++++++++++++++++++++++ src/pixmaps/machina-icon.svg | 49 -------------------------------- 10 files changed, 73 insertions(+), 145 deletions(-) delete mode 100644 src/gui/machina-icon.svg create mode 100644 src/gui/machina.svg delete mode 100644 src/pixmaps/machina-icon.svg diff --git a/src/Makefile.am b/src/Makefile.am index cdaad80..1d4e85f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,3 @@ -#globalpixmapsdir = $(datadir)/pixmaps -#dist_globalpixmaps_DATA = machina-icon.svg - SUBDIRS = engine gui bin_PROGRAMS = midi2machina 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 @@ -38,13 +38,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 item, GdkEventButton* event) { 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 port1, SharedPtr port2); - void status_message(const string& msg); - void build(SharedPtr 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 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-icon.svg b/src/gui/machina-icon.svg deleted file mode 100644 index 39f7be0..0000000 --- a/src/gui/machina-icon.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - - 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 @@ 480 True False - machina-icon.svg + machina.svg True False False @@ -629,7 +629,7 @@ along with Machina; if not, write to the Free Software Foundation, Inc., Website: Dave Robillard <dave@drobilla.net> translator-credits - machina-icon.svg + machina.svg @@ -640,6 +640,7 @@ along with Machina; if not, write to the Free Software Foundation, Inc., False False False + machina.svg gtk-help True False @@ -726,6 +727,7 @@ Selector nodes are shown in green. False False False + machina.svg True True True diff --git a/src/gui/machina.svg b/src/gui/machina.svg new file mode 100644 index 0000000..39f7be0 --- /dev/null +++ b/src/gui/machina.svg @@ -0,0 +1,66 @@ + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/pixmaps/machina-icon.svg b/src/pixmaps/machina-icon.svg deleted file mode 100644 index e8b359f..0000000 --- a/src/pixmaps/machina-icon.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - a - b - - -- cgit v1.2.1