summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2006-10-17 08:03:33 +0000
committerDavid Robillard <d@drobilla.net>2006-10-17 08:03:33 +0000
commit5b83af28b6eeb52a285618cd90f30a5461189efd (patch)
treea9dee31f5b74a175b9bff223df49a847ede41ab4 /src
parent50dadd7684f90d3f7c6c982f4a63f2d0c09f296a (diff)
downloadpatchage-5b83af28b6eeb52a285618cd90f30a5461189efd.tar.gz
patchage-5b83af28b6eeb52a285618cd90f30a5461189efd.tar.bz2
patchage-5b83af28b6eeb52a285618cd90f30a5461189efd.zip
Launch servers by default on start (unless environment variables are set), i.e.
do what usual clients are "supposed to" do. Fixed icon bug. git-svn-id: http://svn.drobilla.net/lad/patchage@188 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/LashDriver.cpp2
-rw-r--r--src/Makefile.am3
-rw-r--r--src/patchage-icon.svg55
-rw-r--r--src/patchage.glade39
4 files changed, 79 insertions, 20 deletions
diff --git a/src/LashDriver.cpp b/src/LashDriver.cpp
index 7347842..ee92176 100644
--- a/src/LashDriver.cpp
+++ b/src/LashDriver.cpp
@@ -49,7 +49,7 @@ LashDriver::attach(bool launch_daemon)
return;
int lash_flags = LASH_Config_File;
- if (launch_daemon)
+ if (!launch_daemon)
lash_flags |= LASH_No_Start_Server;
m_client = lash_init(m_args, PACKAGE_NAME, lash_flags, LASH_PROTOCOL(2, 0));
if (m_client == NULL) {
diff --git a/src/Makefile.am b/src/Makefile.am
index 0942c18..320d81a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,9 @@ EXTRA_DIST = patchage.gladep
sharefilesdir = $(pkgdatadir)
dist_sharefiles_DATA = patchage.glade
+globalpixmapsdir = $(datadir)/pixmaps
+dist_globalpixmaps_DATA = patchage-icon.svg
+
bin_PROGRAMS = patchage
patchage_SOURCES = \
main.cpp \
diff --git a/src/patchage-icon.svg b/src/patchage-icon.svg
new file mode 100644
index 0000000..2ae321a
--- /dev/null
+++ b/src/patchage-icon.svg
@@ -0,0 +1,55 @@
+<?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="418"
+ height="91"
+ version="1.0"
+ sodipodi:docbase="/home/dave/code/codesonnet/patchage"
+ sodipodi:docname="patchage-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="771"
+ inkscape:window-width="1183"
+ 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="1"
+ inkscape:cx="423.92086"
+ inkscape:cy="52.440303"
+ inkscape:window-x="293"
+ inkscape:window-y="52"
+ inkscape:current-layer="svg2" />
+ <path
+ style="fill:black"
+ d="M 2.6348584,88.927424 L -4.9282924e-08,86.854844 L -4.9282924e-08,45.500004 L -4.9282924e-08,4.145164 L 2.6348584,2.072584 C 5.2497984,0.015664003 5.8648884,4.0026076e-06 84,4.0026076e-06 C 162.13511,4.0026076e-06 162.7502,0.015664003 165.36514,2.072584 C 166.83059,3.225304 168,5.153714 168,6.417594 C 168,7.667434 168.95164,9.547274 170.11476,10.595014 C 171.27788,11.642754 172.61674,13.512504 173.09001,14.750004 L 173.9505,17.000004 L 265.0207,17.000004 L 356.09091,17.000004 L 358.54545,19.454544 C 359.89545,20.804544 361,22.604544 361,23.454544 C 361,24.710104 362.39661,25.000004 368.44543,25.000004 C 375.5564,25.000004 375.94947,24.878094 377.19543,22.286324 C 377.91295,20.793804 379.75355,18.881304 381.28566,18.036324 C 384.00254,16.537934 384.45504,16.697524 399.61221,24.500004 C 408.1597,28.900004 415.79365,33.387624 416.57655,34.472504 C 418.25466,36.797904 418.44321,42.948964 416.93611,46.202944 C 415.82579,48.600274 386.03069,69.000004 383.63957,69.000004 C 381.38046,69.000004 377.15632,65.118064 376.81694,62.730074 C 376.52451,60.672434 375.90075,60.477414 368.75,60.207934 C 361.46509,59.933394 361,60.041144 361,62.003394 C 361,63.151524 359.89545,65.195454 358.54545,66.545454 L 356.09091,69.000004 L 265.15675,69.000004 L 174.22258,69.000004 L 173.59598,72.340064 C 173.25135,74.177104 171.85127,76.730544 170.48469,78.014384 C 168.82599,79.572644 168,81.430064 168,83.601734 C 168,85.925044 167.24691,87.447214 165.36514,88.927424 C 162.7502,90.984334 162.13511,91.000004 84,91.000004 C 5.8648884,91.000004 5.2497984,90.984334 2.6348584,88.927424 z M 169.92971,64.190984 C 169.8837,57.845824 169.56271,55.190504 169,56.500004 C 167.75788,59.390584 167.75788,75.267674 169,74.500004 C 169.56364,74.151644 169.96933,69.653244 169.92971,64.190984 z M 342,62.139574 C 342,60.566334 341.71383,57.191334 341.36408,54.639574 L 340.72815,50.000004 L 257.36408,50.000004 L 174,50.000004 L 174,57.500004 L 174,65.000004 L 258,65.000004 L 342,65.000004 L 342,62.139574 z M 355.8,63.800004 C 356.47937,63.120634 357,59.866664 357,56.300004 C 357,50.321774 356.87778,50.000004 354.60699,50.000004 C 351.63154,50.000004 351,51.590114 351,59.081784 C 351,64.114144 351.26943,65.000004 352.8,65.000004 C 353.79,65.000004 355.14,64.460004 355.8,63.800004 z M 396.12122,57.285144 C 407.1899,49.770044 407.40663,49.551864 404.49205,48.858264 C 397.0616,47.089994 390.00687,46.393124 389.06557,47.334424 C 388.52398,47.876024 386.37516,48.376914 384.29043,48.447514 L 380.5,48.575894 L 380.20226,55.377954 C 379.90589,62.148614 380.88362,65.000004 383.50161,65.000004 C 384.19281,65.000004 389.87164,61.528314 396.12122,57.285144 z M 376.5401,55.935114 C 376.90208,55.349424 376.90824,53.324424 376.55381,51.435114 L 375.90937,48.000004 L 368.45469,48.000004 L 361,48.000004 L 361,52.500004 L 361,57.000004 L 368.44098,57.000004 C 372.62521,57.000004 376.17002,56.533924 376.5401,55.935114 z M 413.31822,35.970554 C 412.8682,35.549314 408.80618,33.337404 404.29151,31.055184 C 399.19149,28.131868 393.41275,24.97839 391.64168,24.621683 C 388.69678,23.082718 386.3454,21.931923 383.71306,21.872988 C 381.53313,21.328007 380.5,24.500004 380.5,24.500004 L 380.5,33.500004 L 380.5,42.500004 C 383.94913,43.260136 385.77648,41.126112 388.82957,40.173544 C 394.61802,38.690129 396.28904,39.928696 397.45102,40.374586 C 403.01417,42.509366 402.27539,42.132824 407.5,42.779624 L 413.5,43.522414 L 413.81822,40.129434 C 413.99324,38.263284 413.76824,36.391794 413.31822,35.970554 z M 376.55463,38.638374 C 376.88063,37.339474 377.0017,34.751974 376.82368,32.888374 L 376.5,29.500004 L 368.75,29.207934 L 361,28.915874 L 361,34.957934 L 361,41.000004 L 368.48095,41.000004 C 375.50975,41.000004 375.99772,40.857264 376.55463,38.638374 z M 169.0343,15.634304 C 168.3219,14.921904 168,17.904644 168,25.218214 C 168,39.854494 169.43381,42.157604 169.7843,28.084304 C 169.95663,21.164784 169.66123,16.261234 169.0343,15.634304 z M 341.39301,37.418214 C 342.17914,35.369604 342.17914,25.630394 341.39301,23.581784 C 340.84623,22.156904 332.51404,22.000004 257.39301,22.000004 L 174,22.000004 L 174,30.500004 L 174,39.000004 L 257.39301,39.000004 C 332.51404,39.000004 340.84623,38.843094 341.39301,37.418214 z M 356.79044,30.750004 C 356.50265,22.575234 356.47492,22.497114 353.75,22.183574 L 351,21.867154 L 351,30.433574 L 351,39.000004 L 354.04044,39.000004 L 357.08088,39.000004 L 356.79044,30.750004 z "
+ id="path1873"
+ sodipodi:nodetypes="cccccsssscccccssssssssssscccccssssccssccccccccccccssssccsscccsccccccccccccccccccsccccccccccccccssccscccccccccccccc" />
+</svg>
diff --git a/src/patchage.glade b/src/patchage.glade
index 1550031..f6dada3 100644
--- a/src/patchage.glade
+++ b/src/patchage.glade
@@ -52,7 +52,7 @@
<accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image563">
+ <widget class="GtkImage" id="image607">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -74,7 +74,7 @@
<accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image564">
+ <widget class="GtkImage" id="image608">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon_size">1</property>
@@ -96,7 +96,7 @@
<accelerator key="S" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image565">
+ <widget class="GtkImage" id="image609">
<property name="visible">True</property>
<property name="stock">gtk-save-as</property>
<property name="icon_size">1</property>
@@ -125,7 +125,7 @@
<accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image566">
+ <widget class="GtkImage" id="image610">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon_size">1</property>
@@ -175,7 +175,7 @@
<accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image567">
+ <widget class="GtkImage" id="image611">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -197,13 +197,13 @@
<child>
<widget class="GtkImageMenuItem" id="launch_jack_menuitem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Launch JACK</property>
+ <property name="label" translatable="yes">Connect to JACK (Launch)</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_launch_jack_menuitem_activate" last_modification_time="Wed, 05 Apr 2006 04:52:35 GMT"/>
<accelerator key="J" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image568">
+ <widget class="GtkImage" id="image612">
<property name="visible">True</property>
<property name="stock">gtk-execute</property>
<property name="icon_size">1</property>
@@ -219,13 +219,13 @@
<child>
<widget class="GtkImageMenuItem" id="connect_to_jack_menuitem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Connect to _JACK</property>
+ <property name="label" translatable="yes">Connect to _JACK (Don't Launch)</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_connect_to_jack_menuitem_activate" last_modification_time="Wed, 05 Apr 2006 04:27:40 GMT"/>
<accelerator key="J" modifiers="GDK_MOD1_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image569">
+ <widget class="GtkImage" id="image613">
<property name="visible">True</property>
<property name="stock">gtk-connect</property>
<property name="icon_size">1</property>
@@ -247,7 +247,7 @@
<accelerator key="J" modifiers="GDK_SHIFT_MASK | GDK_MOD1_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image570">
+ <widget class="GtkImage" id="image614">
<property name="visible">True</property>
<property name="stock">gtk-disconnect</property>
<property name="icon_size">1</property>
@@ -275,7 +275,7 @@
<accelerator key="A" modifiers="GDK_MOD1_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image571">
+ <widget class="GtkImage" id="image615">
<property name="visible">True</property>
<property name="stock">gtk-connect</property>
<property name="icon_size">1</property>
@@ -297,7 +297,7 @@
<accelerator key="A" modifiers="GDK_SHIFT_MASK | GDK_MOD1_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image572">
+ <widget class="GtkImage" id="image616">
<property name="visible">True</property>
<property name="stock">gtk-disconnect</property>
<property name="icon_size">1</property>
@@ -319,13 +319,13 @@
<child>
<widget class="GtkImageMenuItem" id="launch_lash_menuitem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Launch LASH</property>
+ <property name="label" translatable="yes">Connect to LASH (Launch)</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_launch_lash1_activate" last_modification_time="Mon, 22 May 2006 01:14:33 GMT"/>
<accelerator key="L" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image573">
+ <widget class="GtkImage" id="image617">
<property name="visible">True</property>
<property name="stock">gtk-execute</property>
<property name="icon_size">1</property>
@@ -341,13 +341,13 @@
<child>
<widget class="GtkImageMenuItem" id="connect_to_lash_menuitem">
<property name="visible">True</property>
- <property name="label" translatable="yes">Connect to _LASH</property>
+ <property name="label" translatable="yes">Connect to _LASH (Don't Launch)</property>
<property name="use_underline">True</property>
<signal name="activate" handler="on_connect_to_lash1_activate" last_modification_time="Mon, 22 May 2006 01:14:33 GMT"/>
<accelerator key="L" modifiers="GDK_MOD1_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image574">
+ <widget class="GtkImage" id="image618">
<property name="visible">True</property>
<property name="stock">gtk-connect</property>
<property name="icon_size">1</property>
@@ -369,7 +369,7 @@
<accelerator key="L" modifiers="GDK_SHIFT_MASK | GDK_MOD1_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image575">
+ <widget class="GtkImage" id="image619">
<property name="visible">True</property>
<property name="stock">gtk-disconnect</property>
<property name="icon_size">1</property>
@@ -416,7 +416,7 @@
<accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image576">
+ <widget class="GtkImage" id="image620">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -836,7 +836,7 @@
<property name="destroy_with_parent">True</property>
<property name="name" translatable="yes">Patchage</property>
<property name="copyright" translatable="yes">© 2006 Dave Robillard</property>
- <property name="comments" translatable="yes">A control centre for audio and music production systems</property>
+ <property name="comments" translatable="yes">A control centre for music/audio systems</property>
<property name="license" translatable="yes">Patchage is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
@@ -855,6 +855,7 @@ along with Patchage; if not, write to the Free Software Foundation, Inc.,
<property name="website">http://codeson.net/software/patchage</property>
<property name="authors">Dave Robillard &lt;dave@codeson.net&gt;</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">patchage-icon.svg</property>
</widget>
<widget class="GtkDialog" id="jack_settings_win">
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 15:01:12 +0000