summaryrefslogtreecommitdiff
path: root/data/ui
diff options
context:
space:
mode:
Diffstat (limited to 'data/ui')
-rw-r--r--data/ui/addconnectiondialog.ui4
-rw-r--r--data/ui/bus.ui1
-rw-r--r--data/ui/executedialog.ui28
-rw-r--r--data/ui/introspection.ui32
-rw-r--r--data/ui/mainwindow.ui79
5 files changed, 86 insertions, 58 deletions
diff --git a/data/ui/addconnectiondialog.ui b/data/ui/addconnectiondialog.ui
index e7ca4ac..e37f00c 100644
--- a/data/ui/addconnectiondialog.ui
+++ b/data/ui/addconnectiondialog.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.0 -->
<interface>
- <requires lib="gtk+" version="3.2"/>
+ <requires lib="gtk+" version="3.10"/>
<template class="AddConnectionDialog" parent="GtkDialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -56,8 +56,8 @@
<object class="GtkComboBoxText" id="address_combo_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="active">0</property>
<property name="has_entry">True</property>
+ <property name="active_id">0</property>
<child internal-child="entry">
<object class="GtkEntry">
<property name="can_focus">False</property>
diff --git a/data/ui/bus.ui b/data/ui/bus.ui
index 223cb2e..62fb460 100644
--- a/data/ui/bus.ui
+++ b/data/ui/bus.ui
@@ -35,6 +35,7 @@
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="shadow_type">none</property>
<child>
<object class="GtkListBox" id="bus_listbox">
<property name="visible">True</property>
diff --git a/data/ui/executedialog.ui b/data/ui/executedialog.ui
index b039a1c..b385e5c 100644
--- a/data/ui/executedialog.ui
+++ b/data/ui/executedialog.ui
@@ -2,6 +2,13 @@
<!-- Generated with glade 3.22.0 -->
<interface>
<requires lib="gtk+" version="3.12"/>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">1</property>
+ <property name="upper">100</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<template class="ExecuteMethodDialog" parent="GtkDialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Execute D-Bus Method</property>
@@ -336,9 +343,7 @@
<object class="GtkLabel" id="label_method_name">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_left">5</property>
- <property name="margin_start">5</property>
+ <property name="halign">baseline</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
<property name="selectable">True</property>
@@ -399,9 +404,7 @@
<object class="GtkLabel" id="label_object_path">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_left">5</property>
- <property name="margin_start">5</property>
+ <property name="halign">baseline</property>
<property name="use_markup">True</property>
<property name="selectable">True</property>
</object>
@@ -415,8 +418,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="margin_left">5</property>
- <property name="margin_start">5</property>
<property name="use_markup">True</property>
<property name="selectable">True</property>
</object>
@@ -444,9 +445,7 @@
<object class="GtkLabel" id="label_bus_name">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="margin_left">5</property>
- <property name="margin_start">5</property>
+ <property name="halign">baseline</property>
<property name="use_markup">True</property>
<property name="selectable">True</property>
</object>
@@ -479,11 +478,4 @@
<placeholder/>
</child>
</template>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="lower">1</property>
- <property name="upper">100</property>
- <property name="value">1</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
</interface>
diff --git a/data/ui/introspection.ui b/data/ui/introspection.ui
index e551dc7..bcdb9d9 100644
--- a/data/ui/introspection.ui
+++ b/data/ui/introspection.ui
@@ -1,35 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.0 -->
<interface>
- <requires lib="gtk+" version="3.20"/>
- <object class="GtkMessageDialog" id="messagedialog">
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="border_width">5</property>
- <property name="type_hint">dialog</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="message_type">error</property>
- <property name="buttons">close</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="messagedialog-vbox">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="messagedialog-action_area">
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkTreeStore" id="treestore">
<columns>
<!-- column-name gchararray1 -->
diff --git a/data/ui/mainwindow.ui b/data/ui/mainwindow.ui
index 55844c6..c621a62 100644
--- a/data/ui/mainwindow.ui
+++ b/data/ui/mainwindow.ui
@@ -1,23 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.0 -->
<interface>
- <requires lib="gtk+" version="3.10"/>
+ <requires lib="gtk+" version="3.12" />
+ <object class="GtkPopoverMenu" id="popover1">
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin">6</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkModelButton">
+ <property name="visible">True</property>
+ <property name="action_name">win.connect-system-bus</property>
+ <property name="text" translatable="yes">Connect to System Bus</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkModelButton">
+ <property name="visible">True</property>
+ <property name="action_name">win.connect-session-bus</property>
+ <property name="text" translatable="yes">Connect to Session Bus</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkModelButton">
+ <property name="visible">True</property>
+ <property name="action_name">win.connect-other-bus</property>
+ <property name="text" translatable="yes">Connect to other Bus</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparator">
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkModelButton">
+ <property name="visible">True</property>
+ <property name="action_name">win.close-bus</property>
+ <property name="text" translatable="yes">Close Bus</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSeparator">
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkModelButton">
+ <property name="visible">True</property>
+ <property name="action_name">app.help</property>
+ <property name="text" translatable="yes">Help</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkModelButton">
+ <property name="visible">True</property>
+ <property name="action_name">app.about</property>
+ <property name="text" translatable="yes">About D-Feet</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+
<template class="DFeetWindow" parent="GtkApplicationWindow">
<property name="can_focus">False</property>
<property name="default_width">600</property>
<property name="default_height">480</property>
- <signal name="delete-event" handler="window_deleted" swapped="no"/>
- <signal name="destroy" handler="window_destroyed" swapped="no"/>
+ <property name="icon_name">org.gnome.dfeet</property>
+ <signal name="delete-event" handler="window_deleted" swapped="no" />
<child>
<object class="GtkStack" id="buses_stack">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="transition_duration">300</property>
<property name="transition_type">slide-left-right</property>
- <signal name="add" handler="stack_child_added" swapped="no"/>
- <signal name="remove" handler="stack_child_removed" swapped="no"/>
+ <signal name="add" handler="stack_child_added" swapped="no" />
+ <signal name="remove" handler="stack_child_removed" swapped="no" />
<child>
- <placeholder/>
+ <placeholder />
</child>
</object>
</child>
@@ -40,7 +103,7 @@
<property name="can_focus">False</property>
<property name="receives_default">False</property>
<property name="valign">center</property>
- <property name="action_name">win.gear-menu</property>
+ <property name="popover">popover1</property>
<child>
<object class="GtkImage" id="gear_image">
<property name="visible">True</property>
@@ -60,4 +123,4 @@
</object>
</child>
</template>
-</interface>
+</interface> \ No newline at end of file
View Lorry Controller Status