summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/App.cpp2
-rw-r--r--src/gui/ingen-icon.svg54
-rw-r--r--src/gui/ingen.svg54
-rw-r--r--src/gui/ingen_gui.glade13
-rw-r--r--src/gui/wscript1
5 files changed, 1 insertions, 123 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp
index 3a95e36b..c9ab363d 100644
--- a/src/gui/App.cpp
+++ b/src/gui/App.cpp
@@ -440,7 +440,7 @@ void*
App::icon_destroyed(void* data)
{
pair<string, int>* p = static_cast<pair<string, int>*>(data);
- cerr << "Destroyed icon " << p->first << " with size " << p->second << endl;
+ //cerr << "Destroyed icon " << p->first << " with size " << p->second << endl;
Icons::iterator iter = instance()._icons.find(*p);
if (iter != instance()._icons.end())
instance()._icons.erase(iter);
diff --git a/src/gui/ingen-icon.svg b/src/gui/ingen-icon.svg
deleted file mode 100644
index a15ed7e7..00000000
--- a/src/gui/ingen-icon.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44.1"
- width="64"
- height="64"
- version="1.0"
- sodipodi:docbase="/home/dave/code/codesonnet/ingen/src/progs/ingenuity"
- sodipodi:docname="ingen-icon.svg">
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs5" />
- <sodipodi:namedview
- inkscape:window-height="575"
- inkscape:window-width="853"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- guidetolerance="10.0"
- gridtolerance="10.0"
- objecttolerance="10.0"
- borderopacity="1.0"
- bordercolor="#666666"
- pagecolor="#ffffff"
- id="base"
- inkscape:zoom="5.921875"
- inkscape:cx="32"
- inkscape:cy="31.915567"
- inkscape:window-x="569"
- inkscape:window-y="167"
- inkscape:current-layer="svg2" />
- <path
- style="fill:black"
- d="M 7.3978252,58.655244 C 3.8646112,57.233665 3.1688652,52.819494 3.1688652,31.824538 C 3.1688652,10.379073 3.8359622,6.4337347 7.7136682,4.9457196 C 9.8253032,4.135409 54.512427,4.135409 56.624063,4.9457196 C 60.501768,6.4337347 61.168865,10.379073 61.168865,31.824538 C 61.168865,53.270003 60.501768,57.215342 56.624063,58.703357 C 54.702346,59.440788 9.2397932,59.396354 7.3978252,58.655244 z M 55.234606,55.289354 C 57.058692,54.313133 57.168865,52.976602 57.168865,31.824538 C 57.168865,10.672474 57.058692,9.3359433 55.234606,8.3597221 C 52.64791,6.9753642 11.68982,6.9753642 9.1031242,8.3597221 C 7.2790962,9.3359123 7.1688652,10.672309 7.1688652,31.810032 C 7.1688652,52.102806 7.3345622,54.321667 8.9188652,55.244439 C 11.279929,56.619633 52.673952,56.659775 55.234606,55.289354 z M 37.168865,48.891926 C 37.168865,47.331323 36.446365,46.230001 35.153333,45.819608 C 34.04479,45.46777 31.607131,42.787082 29.736313,39.862522 C 25.549347,33.31724 24.555639,32.64737 23.756486,35.831449 C 23.178349,38.13493 22.684027,38.324538 17.256802,38.324538 C 10.799575,38.324538 10.168865,37.746144 10.168865,31.824538 C 10.168865,25.902932 10.799575,25.324538 17.256802,25.324538 C 22.684027,25.324538 23.178349,25.514146 23.756486,27.817627 C 24.555639,31.001706 25.549347,30.331836 29.736313,23.786554 C 31.607131,20.861994 34.04479,18.181306 35.153333,17.829468 C 36.446365,17.419075 37.168865,16.317753 37.168865,14.75715 C 37.168865,12.479647 37.514343,12.324538 42.587078,12.324538 C 50.54284,12.324538 51.168865,12.761099 51.168865,18.309082 C 51.168865,24.371452 49.795116,25.518459 43.000041,25.129613 C 38.343077,24.86312 37.628453,24.53999 37.349314,22.574538 C 36.852569,19.076888 35.536131,19.853195 31.414126,26.074538 L 27.604413,31.824538 L 31.418918,37.574538 C 35.547694,43.798272 36.853067,44.568677 37.349314,41.074538 C 37.628453,39.109086 38.343077,38.785956 43.000041,38.519463 C 49.795116,38.130617 51.168865,39.277624 51.168865,45.339994 C 51.168865,50.887977 50.54284,51.324538 42.587078,51.324538 C 37.514343,51.324538 37.168865,51.169429 37.168865,48.891926 z "
- id="path1873" />
-</svg>
diff --git a/src/gui/ingen.svg b/src/gui/ingen.svg
deleted file mode 100644
index a15ed7e7..00000000
--- a/src/gui/ingen.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.44.1"
- width="64"
- height="64"
- version="1.0"
- sodipodi:docbase="/home/dave/code/codesonnet/ingen/src/progs/ingenuity"
- sodipodi:docname="ingen-icon.svg">
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs5" />
- <sodipodi:namedview
- inkscape:window-height="575"
- inkscape:window-width="853"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- guidetolerance="10.0"
- gridtolerance="10.0"
- objecttolerance="10.0"
- borderopacity="1.0"
- bordercolor="#666666"
- pagecolor="#ffffff"
- id="base"
- inkscape:zoom="5.921875"
- inkscape:cx="32"
- inkscape:cy="31.915567"
- inkscape:window-x="569"
- inkscape:window-y="167"
- inkscape:current-layer="svg2" />
- <path
- style="fill:black"
- d="M 7.3978252,58.655244 C 3.8646112,57.233665 3.1688652,52.819494 3.1688652,31.824538 C 3.1688652,10.379073 3.8359622,6.4337347 7.7136682,4.9457196 C 9.8253032,4.135409 54.512427,4.135409 56.624063,4.9457196 C 60.501768,6.4337347 61.168865,10.379073 61.168865,31.824538 C 61.168865,53.270003 60.501768,57.215342 56.624063,58.703357 C 54.702346,59.440788 9.2397932,59.396354 7.3978252,58.655244 z M 55.234606,55.289354 C 57.058692,54.313133 57.168865,52.976602 57.168865,31.824538 C 57.168865,10.672474 57.058692,9.3359433 55.234606,8.3597221 C 52.64791,6.9753642 11.68982,6.9753642 9.1031242,8.3597221 C 7.2790962,9.3359123 7.1688652,10.672309 7.1688652,31.810032 C 7.1688652,52.102806 7.3345622,54.321667 8.9188652,55.244439 C 11.279929,56.619633 52.673952,56.659775 55.234606,55.289354 z M 37.168865,48.891926 C 37.168865,47.331323 36.446365,46.230001 35.153333,45.819608 C 34.04479,45.46777 31.607131,42.787082 29.736313,39.862522 C 25.549347,33.31724 24.555639,32.64737 23.756486,35.831449 C 23.178349,38.13493 22.684027,38.324538 17.256802,38.324538 C 10.799575,38.324538 10.168865,37.746144 10.168865,31.824538 C 10.168865,25.902932 10.799575,25.324538 17.256802,25.324538 C 22.684027,25.324538 23.178349,25.514146 23.756486,27.817627 C 24.555639,31.001706 25.549347,30.331836 29.736313,23.786554 C 31.607131,20.861994 34.04479,18.181306 35.153333,17.829468 C 36.446365,17.419075 37.168865,16.317753 37.168865,14.75715 C 37.168865,12.479647 37.514343,12.324538 42.587078,12.324538 C 50.54284,12.324538 51.168865,12.761099 51.168865,18.309082 C 51.168865,24.371452 49.795116,25.518459 43.000041,25.129613 C 38.343077,24.86312 37.628453,24.53999 37.349314,22.574538 C 36.852569,19.076888 35.536131,19.853195 31.414126,26.074538 L 27.604413,31.824538 L 31.418918,37.574538 C 35.547694,43.798272 36.853067,44.568677 37.349314,41.074538 C 37.628453,39.109086 38.343077,38.785956 43.000041,38.519463 C 49.795116,38.130617 51.168865,39.277624 51.168865,45.339994 C 51.168865,50.887977 50.54284,51.324538 42.587078,51.324538 C 37.514343,51.324538 37.168865,51.169429 37.168865,48.891926 z "
- id="path1873" />
-</svg>
diff --git a/src/gui/ingen_gui.glade b/src/gui/ingen_gui.glade
index b10e0425..0cbc6292 100644
--- a/src/gui/ingen_gui.glade
+++ b/src/gui/ingen_gui.glade
@@ -6,7 +6,6 @@
<property name="title" translatable="yes">Ingen</property>
<property name="default_width">640</property>
<property name="default_height">480</property>
- <property name="icon">ingen.svg</property>
<child>
<widget class="GtkVBox" id="patch_win_vbox">
<property name="visible">True</property>
@@ -511,7 +510,6 @@
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="default_width">640</property>
<property name="default_height">480</property>
- <property name="icon">ingen.svg</property>
<child>
<widget class="GtkVBox" id="vbox9">
<property name="visible">True</property>
@@ -704,7 +702,6 @@
<property name="title" translatable="yes">Create Subpatch</property>
<property name="resizable">False</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="icon">ingen.svg</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child>
<widget class="GtkVBox" id="vbox4">
@@ -857,7 +854,6 @@
<widget class="GtkFileChooserDialog" id="load_subpatch_win">
<property name="title" translatable="yes">Load Subpatch</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="icon">ingen.svg</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
@@ -1095,7 +1091,6 @@
<widget class="GtkFileChooserDialog" id="load_patch_win">
<property name="title" translatable="yes">Load Patch</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="icon">ingen.svg</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="vbox11">
@@ -1734,7 +1729,6 @@
<property name="height_request">180</property>
<property name="border_width">8</property>
<property name="title" translatable="yes">Messages - Ingen</property>
- <property name="icon">ingen.svg</property>
<child>
<widget class="GtkVBox" id="vbox12">
<property name="visible">True</property>
@@ -1803,7 +1797,6 @@
<widget class="GtkWindow" id="config_win">
<property name="border_width">8</property>
<property name="title" translatable="yes">Configuration - Ingen</property>
- <property name="icon">ingen.svg</property>
<child>
<widget class="GtkVBox" id="vbox13">
<property name="visible">True</property>
@@ -1923,7 +1916,6 @@
<property name="border_width">8</property>
<property name="title" translatable="yes">Patch Description</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="icon">ingen.svg</property>
<child>
<widget class="GtkVBox" id="vbox14">
<property name="visible">True</property>
@@ -2047,7 +2039,6 @@
<property name="width_request">250</property>
<property name="title" translatable="yes">Rename</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="icon">ingen.svg</property>
<child>
<widget class="GtkVBox" id="vbox15">
<property name="visible">True</property>
@@ -2164,7 +2155,6 @@
<property name="border_width">8</property>
<property name="title" translatable="yes">Node Properties - Ingen</property>
<property name="window_position">GTK_WIN_POS_MOUSE</property>
- <property name="icon">ingen.svg</property>
<child>
<widget class="GtkVBox" id="vbox17">
<property name="visible">True</property>
@@ -2367,7 +2357,6 @@ Contributors:
<property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property>
<property name="artists">Usability / UI Design:
Thorsten Wilms</property>
- <property name="logo">ingen.svg</property>
<property name="wrap_license">True</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox3">
@@ -2387,7 +2376,6 @@ Contributors:
<property name="height_request">340</property>
<property name="border_width">8</property>
<property name="title" translatable="yes">Patches - Ingen</property>
- <property name="icon">ingen.svg</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow8">
<property name="visible">True</property>
@@ -2411,7 +2399,6 @@ Contributors:
<property name="border_width">6</property>
<property name="title" translatable="yes">Engine - Ingen</property>
<property name="resizable">False</property>
- <property name="icon">ingen.svg</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox4">
diff --git a/src/gui/wscript b/src/gui/wscript
index d59ba6a3..cc2fe7f0 100644
--- a/src/gui/wscript
+++ b/src/gui/wscript
@@ -65,6 +65,5 @@ def build(bld):
# GUI runtime files
bld.install_files('${DATADIR}/ingen', 'ingen_gui.glade')
- bld.install_files('${DATADIR}/ingen', 'ingen.svg')