rra
/
dropship
2
1
Fork 0
Code Issues 11 Pull Requests Releases Wiki Activity
Browse Source

status icon & button are now stacks, properly ellipsize label, tweak layout

unifiedWindowUI
rra 4 years ago
parent
ce89f0f463
commit
46761036cc
2 changed files with 107 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      dropship.glade
  2. 113
      pendingTransmissions.ui

42
dropship.glade
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 --> <!-- Generated with glade 3.36.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk+" version="3.20"/>
<object class="GtkApplicationWindow" id="mainWindow"> <object class="GtkApplicationWindow" id="mainWindow">
@ -7,21 +7,6 @@
<property name="resizable">False</property> <property name="resizable">False</property>
<property name="default_width">250</property> <property name="default_width">250</property>
<property name="default_height">250</property> <property name="default_height">250</property>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkStackSwitcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="stack">sendReceiveStack</property>
</object>
</child>
</object>
</child>
<child> <child>
<object class="GtkStack" id="sendReceiveStack"> <object class="GtkStack" id="sendReceiveStack">
<property name="visible">True</property> <property name="visible">True</property>
@ -114,8 +99,8 @@
<object class="GtkBox" id="pendingBox"> <object class="GtkBox" id="pendingBox">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="margin_left">16</property> <property name="margin_start">16</property>
<property name="margin_right">16</property> <property name="margin_end">16</property>
<property name="margin_top">16</property> <property name="margin_top">16</property>
<property name="margin_bottom">16</property> <property name="margin_bottom">16</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
@ -131,6 +116,21 @@
</child> </child>
</object> </object>
</child> </child>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkStackSwitcher">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">10</property>
<property name="stack">sendReceiveStack</property>
</object>
</child>
</object>
</child>
</object> </object>
<object class="GtkFileChooserDialog" id="filePicker"> <object class="GtkFileChooserDialog" id="filePicker">
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -139,9 +139,6 @@
<property name="transient_for">mainWindow</property> <property name="transient_for">mainWindow</property>
<property name="has_resize_grip">True</property> <property name="has_resize_grip">True</property>
<property name="select_multiple">True</property> <property name="select_multiple">True</property>
<child type="titlebar">
<placeholder/>
</child>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox"> <object class="GtkBox">
<property name="can_focus">False</property> <property name="can_focus">False</property>
@ -169,5 +166,8 @@
</child> </child>
</object> </object>
</child> </child>
<child type="titlebar">
<placeholder/>
</child>
</object> </object>
</interface> </interface>

113
pendingTransmissions.ui
View File

@ -1,13 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 --> <!-- Generated with glade 3.36.0 -->
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk+" version="3.20"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-no</property>
<property name="icon_size">3</property>
</object>
<template class="PendingTransmission" parent="GtkBox"> <template class="PendingTransmission" parent="GtkBox">
<property name="name">pendingTransmission</property> <property name="name">pendingTransmission</property>
<property name="visible">True</property> <property name="visible">True</property>
@ -20,13 +14,41 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<child> <child>
<object class="GtkImage"> <object class="GtkStack" id="transferStatusStack">
<property name="width_request">50</property>
<property name="height_request">50</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="stock">gtk-network</property> <property name="margin_start">6</property>
<property name="icon_size">6</property> <property name="margin_end">12</property>
<child>
<object class="GtkImage">
<property name="width_request">30</property>
<property name="height_request">30</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">network-transmit</property>
<property name="icon_size">5</property>
</object>
<packing>
<property name="name">page0</property>
<property name="title" translatable="yes">page0</property>
</packing>
</child>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">dialog-ok</property>
<property name="icon_size">5</property>
</object>
<packing>
<property name="name">page1</property>
<property name="title" translatable="yes">page1</property>
<property name="position">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -49,15 +71,15 @@
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
<object class="GtkLabel" id="fileNameLabel"> <object class="GtkLabel" id="fileNameLabel">
<property name="width_request">70</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="halign">start</property> <property name="halign">start</property>
<property name="label" translatable="yes">screenshot_lkashdflasjdjasödjlkasjdlaskdlkashd01-292.jpg</property> <property name="label" translatable="yes">screenshot_lkashdflasjdjasödjlkasjdlaskdlkashd01-292.jpg</property>
<property name="ellipsize">middle</property> <property name="ellipsize">middle</property>
<property name="max_width_chars">20</property>
<property name="track_visited_links">False</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
<attribute name="scale" value="1.2"/>
</attributes> </attributes>
</object> </object>
<packing> <packing>
@ -92,7 +114,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="halign">start</property> <property name="halign">center</property>
<property name="margin_top">6</property> <property name="margin_top">6</property>
<signal name="clicked" handler="transfer_button_click" swapped="no"/> <signal name="clicked" handler="transfer_button_click" swapped="no"/>
</object> </object>
@ -110,19 +132,50 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkButton" id="cancelTransmission"> <object class="GtkStack" id="statusButtonsStack">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">False</property>
<property name="receives_default">True</property> <property name="margin_start">12</property>
<property name="halign">center</property> <property name="margin_end">6</property>
<property name="valign">center</property> <property name="hhomogeneous">False</property>
<property name="margin_top">16</property> <property name="transition_type">crossfade</property>
<property name="margin_bottom">16</property> <child>
<property name="image">image1</property> <object class="GtkButton" id="cancelTransmission">
<signal name="clicked" handler="cancel_transfer" swapped="no"/> <property name="visible">True</property>
<style> <property name="can_focus">True</property>
<class name="circular"/> <property name="receives_default">True</property>
</style> <property name="halign">center</property>
<property name="valign">center</property>
<property name="margin_top">16</property>
<property name="margin_bottom">16</property>
<property name="image">image1</property>
<signal name="clicked" handler="cancel_transfer" swapped="no"/>
<style>
<class name="circular"/>
</style>
</object>
<packing>
<property name="name">page0</property>
<property name="title" translatable="yes">page0</property>
</packing>
</child>
<child>
<object class="GtkButton">
<property name="label" translatable="yes">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="margin_top">16</property>
<property name="margin_bottom">16</property>
</object>
<packing>
<property name="name">page1</property>
<property name="title" translatable="yes">page1</property>
<property name="position">1</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@ -138,4 +191,10 @@
</packing> </packing>
</child> </child>
</template> </template>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-no</property>
<property name="icon_size">3</property>
</object>
</interface> </interface>

Write Preview
Loading…
Cancel
Save