summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-09-20 21:20:41 +0000
committerLennart Poettering <lennart@poettering.net>2004-09-20 21:20:41 +0000
commit930d97653b4f9ed36cfd4d7f62c21184dca82785 (patch)
tree9ee14b26e0673e1ec7d6f4c8446cd0c745f960cd
parent16c78fca279f046b405cbab8800199893fc39f6e (diff)
assorted updates
git-svn-id: file:///home/lennart/svn/public/paman/trunk@36 cdefa82f-4ce1-0310-97f5-ab6066f37c3c
-rw-r--r--doc/README.html.in5
-rw-r--r--doc/screenshot.pngbin270142 -> 279219 bytes
-rw-r--r--src/Makefile.am2
-rw-r--r--src/paman.glade99
4 files changed, 71 insertions, 35 deletions
diff --git a/doc/README.html.in b/doc/README.html.in
index 85239fc..ef689b4 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -42,6 +42,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</p>
<h2><a name="news">News</a></h2>
+<div class="news-date">Mon Sep 20 2004: </div> <p class="news-text"><a
+href="@PACKAGE_URL@paman-0.4.tar.gz">Version 0.4</a> released; changes include: compatibility with polypaudio 0.5; many improvements and fixes</p>
+
<div class="news-date">Wed Sep 8 2004: </div> <p class="news-text"><a
href="@PACKAGE_URL@paman-0.3.tar.gz">Version 0.3</a> released; changes include: compatibility with polypaudio 0.4; minor improvements and fixes</p>
@@ -82,6 +85,8 @@ source code configuration.</p>
<p><tt>paman</tt> requires <a href="http://gtkmm.sf.net/"><tt>gtkmm</tt></a> and <tt>glademmm</tt> installed.</p>
<p>Obviously <tt>paman</tt> requires an installation of <tt>polypaudio</tt> (version 0.4).</p>
+
+<p>If you want to have the "Volume Meter" buttons working, your need to install <a href="http://0pointer.de/lennart/projects/pavumeter/">pavumeter</a>.</p>
<h2><a name="installation">Installation</a></h2>
diff --git a/doc/screenshot.png b/doc/screenshot.png
index 1fc4f0d..3e4a0dc 100644
--- a/doc/screenshot.png
+++ b/doc/screenshot.png
Binary files differ
diff --git a/src/Makefile.am b/src/Makefile.am
index d25d0bb..bd2d3ce 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,5 +35,5 @@ paman_SOURCES=MainWindow.cc MainWindow.hh \
paman_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(POLYP_LIBS)
paman_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(POLYP_CFLAGS)
-#paman_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/paman.glade\"
+paman_CXXFLAGS+=-DGLADE_FILE=\"$(pkgdatadir)/paman.glade\"
paman_CXXFLAGS+=-DPAVUMETER_PATH=\"/home/lennart/projects/pavumeter/src/pavumeter\"
diff --git a/src/paman.glade b/src/paman.glade
index 4d8ce32..a50e572 100644
--- a/src/paman.glade
+++ b/src/paman.glade
@@ -693,13 +693,13 @@
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox18">
+ <widget class="GtkHBox" id="hbox26">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">0</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkButton" id="connectButton">
+ <widget class="GtkButton" id="statButton">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
@@ -707,7 +707,7 @@
<property name="focus_on_click">True</property>
<child>
- <widget class="GtkAlignment" id="alignment13">
+ <widget class="GtkAlignment" id="alignment15">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -719,15 +719,15 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox18">
+ <widget class="GtkHBox" id="hbox20">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image12">
+ <widget class="GtkImage" id="image14">
<property name="visible">True</property>
- <property name="stock">gtk-network</property>
+ <property name="stock">gtk-dialog-info</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -742,9 +742,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label4803">
+ <widget class="GtkLabel" id="label4805">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Connect</property>
+ <property name="label" translatable="yes">_Statistics</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -766,6 +766,12 @@
</widget>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
</child>
<child>
@@ -829,6 +835,7 @@
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
</widget>
@@ -836,10 +843,16 @@
</widget>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
</child>
<child>
- <widget class="GtkButton" id="statButton">
+ <widget class="GtkButton" id="connectButton">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
@@ -847,7 +860,7 @@
<property name="focus_on_click">True</property>
<child>
- <widget class="GtkAlignment" id="alignment15">
+ <widget class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -859,15 +872,15 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox20">
+ <widget class="GtkHBox" id="hbox18">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image14">
+ <widget class="GtkImage" id="image12">
<property name="visible">True</property>
- <property name="stock">gtk-dialog-info</property>
+ <property name="stock">gtk-network</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -882,9 +895,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label4805">
+ <widget class="GtkLabel" id="label4803">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Statistics</property>
+ <property name="label" translatable="yes">_Connect</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -906,6 +919,12 @@
</widget>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
</child>
</widget>
<packing>
@@ -1449,13 +1468,13 @@
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox17">
+ <widget class="GtkHBox" id="hbox27">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">0</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkButton" id="sampleCachePlayButton">
+ <widget class="GtkButton" id="sampleCacheOpenButton">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
@@ -1463,7 +1482,7 @@
<property name="focus_on_click">True</property>
<child>
- <widget class="GtkAlignment" id="alignment11">
+ <widget class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1475,15 +1494,15 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox16">
+ <widget class="GtkHBox" id="hbox17">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image10">
+ <widget class="GtkImage" id="image11">
<property name="visible">True</property>
- <property name="stock">gtk-cdrom</property>
+ <property name="stock">gtk-jump-to</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1498,9 +1517,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label4801">
+ <widget class="GtkLabel" id="label4802">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Play</property>
+ <property name="label" translatable="yes">_Open</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1522,10 +1541,16 @@
</widget>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
</child>
<child>
- <widget class="GtkButton" id="sampleCacheOpenButton">
+ <widget class="GtkButton" id="sampleCachePlayButton">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
@@ -1533,7 +1558,7 @@
<property name="focus_on_click">True</property>
<child>
- <widget class="GtkAlignment" id="alignment12">
+ <widget class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1545,15 +1570,15 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkHBox" id="hbox17">
+ <widget class="GtkHBox" id="hbox16">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkImage" id="image11">
+ <widget class="GtkImage" id="image10">
<property name="visible">True</property>
- <property name="stock">gtk-jump-to</property>
+ <property name="stock">gtk-cdrom</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1568,9 +1593,9 @@
</child>
<child>
- <widget class="GtkLabel" id="label4802">
+ <widget class="GtkLabel" id="label4801">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Open</property>
+ <property name="label" translatable="yes">_Play</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1592,6 +1617,12 @@
</widget>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
</child>
</widget>
<packing>