From d04fe8106737836df46c5419ceb21b070ffec8e4 Mon Sep 17 00:00:00 2001 From: Lynnesbian Date: Sun, 24 Oct 2021 03:38:07 +1000 Subject: [PATCH] updated glade files to newer version c: also some smol cleanup --- AboutDialogue.cs | 4 +- buypeeb.csproj | 20 +- ui/add.glade | 73 ++++--- ui/main.glade | 511 ++++++++++++++++++++++++---------------------- ui/settings.glade | 249 +++++++++++----------- 5 files changed, 441 insertions(+), 416 deletions(-) diff --git a/AboutDialogue.cs b/AboutDialogue.cs index 3838953..fdd71e8 100644 --- a/AboutDialogue.cs +++ b/AboutDialogue.cs @@ -3,12 +3,12 @@ using Gtk; namespace Buypeeb { public class AboutDialogue : AboutDialog { public AboutDialogue() : this(new Builder("about.glade")) { } - + private AboutDialogue(Builder builder) : base(builder.GetObject("DialogueAbout").Handle) { builder.Autoconnect(this); } - public void ButtonCloseClicked(object sender, Gtk.ResponseArgs args) { + public void ButtonCloseClicked(object sender, ResponseArgs args) { Dispose(); } } diff --git a/buypeeb.csproj b/buypeeb.csproj index 63ea2e1..d86b57f 100755 --- a/buypeeb.csproj +++ b/buypeeb.csproj @@ -7,25 +7,25 @@ - + %(Filename)%(Extension) - - - - - + + + + + - - + + - - + + diff --git a/ui/add.glade b/ui/add.glade index e8f8d66..a7ffc6a 100644 --- a/ui/add.glade +++ b/ui/add.glade @@ -1,37 +1,34 @@ - + - False + False False True - center-on-parent - 320 - True - dialog + center-on-parent + 320 + True + dialog center - - - - False - 5 - 5 + False + 5 + 5 vertical 2 - False - 5 - end + False + 5 + end Cancel True - True - True + True + True True @@ -43,10 +40,10 @@ OK True - True - True - True - True + True + True + True + True True @@ -64,15 +61,15 @@ True - False - 5 - 5 + False + 5 + 5 vertical True - False - 5 + False + 5 Add item @@ -88,7 +85,7 @@ True - False + False start Enter the URL of the item you want to add. @@ -101,12 +98,12 @@ True - True - 5 - 10 - True - URL - url + True + 5 + 10 + True + URL + url False @@ -117,7 +114,7 @@ True - False + False start You may also enter a custom name below. @@ -130,10 +127,10 @@ True - True - 5 - True - Name (optional) + True + 5 + True + Name (optional) False diff --git a/ui/main.glade b/ui/main.glade index e262b6f..f213561 100644 --- a/ui/main.glade +++ b/ui/main.glade @@ -1,107 +1,107 @@ - + True - False - edit-find + False + edit-find True - False - view-sort-ascending + False + view-sort-ascending True - False - True + False + True True - False + False True - False + False Name, Ascending - True + True True - True + True SortMenu True - False + False Name, Descending - True - True + True + True SortMenu True - False + False Price, low to high - True - True + True + True SortMenu True - False + False Price, high to low - True - True + True + True SortMenu True - False + False Ending soonest - True - True + True + True SortMenu True - False + False Ending latest - True - True + True + True SortMenu - False + False True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 vertical 3 True - False - 5 - 5 + False + 5 + 5 Items to hide: @@ -117,9 +117,9 @@ Favourites True - True - False - True + True + False + True @@ -132,9 +132,9 @@ Non-favourites True - True - False - True + True + False + True @@ -147,9 +147,9 @@ Active True - True - False - True + True + False + True @@ -162,9 +162,9 @@ Ended True - True - False - True + True + False + True @@ -177,9 +177,9 @@ Ending today True - True - False - True + True + False + True @@ -192,9 +192,9 @@ Ending after today True - True - False - True + True + False + True @@ -207,9 +207,9 @@ With win price True - True - False - True + True + False + True @@ -222,9 +222,9 @@ With no win price True - True - False - True + True + False + True @@ -237,8 +237,8 @@ Show all True - True - True + True + True False @@ -250,36 +250,36 @@ - False - 810 - 500 + False + 810 + 500 True - False + False vertical True - True + True True - False + False True - False + False vertical - icons + icons True - False - Add new + False + Add new Add new - True - gtk-add + True + gtk-add @@ -291,11 +291,11 @@ True - False - Update all + False + Update all Update all - True - gtk-refresh + True + gtk-refresh @@ -307,7 +307,7 @@ True - False + False False @@ -317,11 +317,11 @@ True - False - Clear ended + False + Clear ended Clear ended - True - gtk-clear + True + gtk-clear @@ -332,11 +332,11 @@ True - False - Clear all + False + Clear all Clear all - True - gtk-delete + True + gtk-delete @@ -347,7 +347,7 @@ True - False + False False @@ -357,11 +357,11 @@ True - False - Open + False + Open Open - True - gtk-open + True + gtk-open @@ -373,11 +373,11 @@ True - False - Save + False + Save Save - True - gtk-save + True + gtk-save @@ -389,11 +389,11 @@ True - False - Save as... + False + Save as... Save as... - True - gtk-save-as + True + gtk-save-as @@ -405,11 +405,11 @@ True - False - Export + False + Export Export - True - gtk-convert + True + gtk-convert @@ -421,7 +421,7 @@ True - False + False True @@ -431,11 +431,11 @@ True - False - Help + False + Help Help - True - gtk-help + True + gtk-help @@ -447,11 +447,11 @@ True - False - Settings + False + Settings Settings - True - gtk-preferences + True + gtk-preferences @@ -463,11 +463,11 @@ True - False - Quit + False + Quit Quit - True - gtk-quit + True + gtk-quit @@ -486,25 +486,25 @@ True - False + False True vertical True - False - 3 - 3 + False + 3 + 3 3 True - True + True True - edit-find-symbolic - False - False - Search... + edit-find-symbolic + False + False + Search... @@ -517,9 +517,9 @@ True - True - False - True + True + False + True popover1 @@ -534,11 +534,11 @@ True - True - False - True + True + False + True menu1 - False + False @@ -559,19 +559,19 @@ True - True + True True True - in - 200 + in + 200 True - True - True - False - 1 - True + True + True + False + 1 + True @@ -589,7 +589,7 @@ True fixed - 100 + 100 Name True @@ -649,21 +649,21 @@ - 200 + 200 True - False - 5 - 5 + False + 5 + 5 vertical True - False + False precious peebus polytonal player (paca edition) center True end - 40 + 40 3 @@ -679,9 +679,9 @@ True - False - 3 - 3 + False + 3 + 3 False @@ -692,185 +692,207 @@ True - False + False vertical + True - False + False start - 5 - 10 + 5 + 10 True - False + False start Original name - 0 - 0 + 0 + 0 True - False + False start Price (Yen) - 0 - 1 + 0 + 1 True - False + False start Price (AUD) - 0 - 2 + 0 + 2 True - False + False start Ending in - 0 - 3 + 0 + 3 True - False + False start Bid count - 0 - 4 + 0 + 4 True - False + False start Buy it now? - 0 - 5 + 0 + 5 True - False + False start Auto extension? - 0 - 6 + 0 + 6 True - False + False end something in japanese end - 1 - 0 + 1 + 0 True - False + False end ¥12345 - 1 - 1 + 1 + 1 True - False + False end $123.45 - 1 - 2 + 1 + 2 True - False + False end True 1h 17m 23s - 1 - 3 + 1 + 3 True - False + False end 5 - 1 - 4 + 1 + 4 True - False + False end Yes - 1 - 5 + 1 + 5 True - False + False end N/A - 1 - 6 + 1 + 6 + + + + + + + + + + + + + + + + + + + + + False @@ -881,16 +903,16 @@ True - False - 5 + False + 5 vertical 5 View on Buyee True - True - True + True + True @@ -903,8 +925,8 @@ View on Yahoo! Auctions True - True - True + True + True @@ -916,43 +938,43 @@ True - False + False True True - expand + expand True - True - True - Remove + True + True + Remove True - False - user-trash + False + user-trash True True - end + end 0 True - True - True - Rename + True + True + Rename True - False + False gtk-edit @@ -966,15 +988,15 @@ True - True - True - Update + True + True + Update True - False - view-refresh + False + view-refresh @@ -987,15 +1009,15 @@ True - True - True - Favourite + True + True + Favourite True - False - emblem-favorite + False + emblem-favorite @@ -1016,14 +1038,14 @@ False True - end + end 1 True - False + False Last updated: 12:34:56 center True @@ -1031,30 +1053,30 @@ False True - end + end 2 True - True - 5 - 5 + True + 5 + 5 True - False - 3 - 3 + False + 3 + 3 vertical 5 - 100 + 100 True - True - word + True + word TextBufferSelectedNotes @@ -1067,13 +1089,13 @@ True - False + False Clear True - True - True + True + True @@ -1086,13 +1108,13 @@ Save True - True - True + True + True False True - end + end 1 @@ -1108,7 +1130,7 @@ True - False + False Notes @@ -1141,8 +1163,5 @@ - - - diff --git a/ui/settings.glade b/ui/settings.glade index 2d631b4..cf0e03b 100644 --- a/ui/settings.glade +++ b/ui/settings.glade @@ -1,294 +1,302 @@ - + - False + False True - 440 - - - + 440 True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 vertical 5 True - True + True True + True - False - 5 - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 + 5 True - False + False start True Show seconds in list view - 0 - 0 + 0 + 0 True - True + True end - 1 - 0 + 1 + 0 True - False + False start True Autosave - 0 - 1 + 0 + 1 True - True + True end - 1 - 1 + 1 + 1 True - False + False start True Show favourites at top of list - 0 - 2 + 0 + 2 True - True + True end - 1 - 2 + 1 + 2 + + + + + + + + + True - False + False General - False + False + True - False - 5 - 5 - 5 - 20 - 3 + False + 5 + 5 + 5 + 20 + 3 True - False + False start True Default - 0 - 0 + 0 + 0 True - False + False start Items ending soon - 0 - 1 + 0 + 1 True - False + False start Favourite items - 0 - 2 + 0 + 2 True - False + False start Favourite items ending soon - 0 - 3 + 0 + 3 True - False + False end seconds - 2 - 0 + 2 + 0 True - False + False end seconds - 2 - 1 + 2 + 1 True - False + False end seconds - 2 - 2 + 2 + 2 True - False + False end seconds - 2 - 3 + 2 + 3 True - True - 5 - 5 - 2 - 2 - 3 - 5 - number + True + 5 + 5 + 2 + 2 + 3 + 5 + number - 1 - 0 + 1 + 0 True - True - 5 - 5 - 2 - 2 - 3 - 5 - number + True + 5 + 5 + 2 + 2 + 3 + 5 + number - 1 - 1 + 1 + 1 True - True - 5 - 5 - 2 - 2 - 3 - 5 - number + True + 5 + 5 + 2 + 2 + 3 + 5 + number - 1 - 2 + 1 + 2 True - True - 5 - 5 - 2 - 2 - 3 - 5 - number + True + 5 + 5 + 2 + 2 + 3 + 5 + number - 1 - 3 + 1 + 3 @@ -299,12 +307,12 @@ True - False + False Update intervals 1 - False + False @@ -317,14 +325,15 @@ True - False + False 5 About Buypeeb True - True - True + True + True + False @@ -336,14 +345,14 @@ Save True - True - True + True + True False True - end + end 1 @@ -351,14 +360,14 @@ Cancel True - True - True + True + True False True - end + end 2 @@ -367,7 +376,7 @@ False True 2 - end + end 4