summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/paman.glade99
2 files changed, 66 insertions, 35 deletions
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>