Compare commits
5 commits
c77c2b34f3
...
d04fe81067
Author | SHA1 | Date | |
---|---|---|---|
d04fe81067 | |||
406af32964 | |||
5ac54873ea | |||
5298a97c18 | |||
6977f74d6e |
11 changed files with 683 additions and 587 deletions
15
AboutDialogue.cs
Normal file
15
AboutDialogue.cs
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
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, ResponseArgs args) {
|
||||||
|
Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -2,9 +2,6 @@ using Gtk;
|
||||||
|
|
||||||
namespace Buypeeb {
|
namespace Buypeeb {
|
||||||
internal class AddItemDialogue : Dialog {
|
internal class AddItemDialogue : Dialog {
|
||||||
public Entry entryURL { get; }
|
|
||||||
public Entry entryName { get; }
|
|
||||||
|
|
||||||
public AddItemDialogue() : this(new Builder("add.glade")) { }
|
public AddItemDialogue() : this(new Builder("add.glade")) { }
|
||||||
|
|
||||||
private AddItemDialogue(Builder builder) : base(builder.GetObject("DialogueAdd").Handle) {
|
private AddItemDialogue(Builder builder) : base(builder.GetObject("DialogueAdd").Handle) {
|
||||||
|
@ -15,6 +12,9 @@ namespace Buypeeb {
|
||||||
DeleteEvent += Window_Shutdown;
|
DeleteEvent += Window_Shutdown;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Entry entryURL { get; }
|
||||||
|
public Entry entryName { get; }
|
||||||
|
|
||||||
private static void Window_Shutdown(object sender, DeleteEventArgs args) {
|
private static void Window_Shutdown(object sender, DeleteEventArgs args) {
|
||||||
Application.Quit();
|
Application.Quit();
|
||||||
}
|
}
|
||||||
|
|
197
MainWindow.cs
197
MainWindow.cs
|
@ -24,6 +24,7 @@ using System.Globalization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
|
using System.Net.Http;
|
||||||
using System.Text.Encodings.Web;
|
using System.Text.Encodings.Web;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
|
@ -39,65 +40,28 @@ using Timeout = GLib.Timeout;
|
||||||
namespace Buypeeb {
|
namespace Buypeeb {
|
||||||
[SuppressMessage("ReSharper", "UnusedMember.Local")]
|
[SuppressMessage("ReSharper", "UnusedMember.Local")]
|
||||||
internal class MainWindow : Window {
|
internal class MainWindow : Window {
|
||||||
private readonly string location;
|
// ...to here.
|
||||||
private readonly JsonSerializerOptions jsonOptions;
|
|
||||||
|
private static readonly SemaphoreSlim TaskLimit = new(6);
|
||||||
|
private readonly Builder builder;
|
||||||
|
private readonly Label endingLabel;
|
||||||
|
private readonly Dictionary<string, CheckButton> filterChecks = new();
|
||||||
|
private readonly HttpClient httpClient;
|
||||||
|
|
||||||
private readonly ListStore items;
|
private readonly ListStore items;
|
||||||
private Settings settings;
|
|
||||||
private readonly TreeView itemTreeView;
|
private readonly TreeView itemTreeView;
|
||||||
private readonly Builder builder;
|
private readonly JsonSerializerOptions jsonOptions;
|
||||||
|
private readonly string location;
|
||||||
|
private readonly SearchEntry searchEntry;
|
||||||
|
|
||||||
// TODO: whenever we get something from the builder, cache it for later
|
// TODO: whenever we get something from the builder, cache it for later
|
||||||
// that way we don't need to constantly do "builder.GetObject"s
|
// that way we don't need to constantly do "builder.GetObject"s
|
||||||
// when that is done, you can use the cache array to replace everything from here...
|
// when that is done, you can use the cache array to replace everything from here...
|
||||||
|
|
||||||
private readonly Box selectionViewBox;
|
private readonly Box selectionViewBox;
|
||||||
private readonly Label endingLabel;
|
private readonly Queue<string> updateQueue = new();
|
||||||
private bool queueActive;
|
private bool queueActive;
|
||||||
private readonly SearchEntry searchEntry;
|
private Settings settings;
|
||||||
private readonly Dictionary<string, CheckButton> filterChecks = new Dictionary<string, CheckButton>();
|
|
||||||
|
|
||||||
// ...to here.
|
|
||||||
|
|
||||||
private static readonly SemaphoreSlim TaskLimit = new SemaphoreSlim(6);
|
|
||||||
private readonly Queue<string> updateQueue = new Queue<string>();
|
|
||||||
|
|
||||||
private IEnumerable<YahooAuctionsItem> filterQuery =>
|
|
||||||
// father forgive me for i have lynned
|
|
||||||
from item in settings.watchlist.Values.ToList()
|
|
||||||
where (item.favourite != filterChecks["Favourites"].Active ||
|
|
||||||
item.favourite == filterChecks["NonFavourites"].Active) &&
|
|
||||||
(item.Available != filterChecks["Active"].Active ||
|
|
||||||
item.Available == filterChecks["Ended"].Active) &&
|
|
||||||
(item.endingToday != filterChecks["EndingToday"].Active ||
|
|
||||||
item.endingToday == filterChecks["EndingAfterToday"].Active) &&
|
|
||||||
(item.hasWinPrice != filterChecks["WithWinPrice"].Active ||
|
|
||||||
item.hasWinPrice == filterChecks["WithNoWinPrice"].Active) &&
|
|
||||||
(string.IsNullOrWhiteSpace(searchEntry.Text) ||
|
|
||||||
item.name.ToLower().Contains(searchEntry.Text.ToLower()) ||
|
|
||||||
item.originalName.ToLower().Contains(searchEntry.Text.ToLower()))
|
|
||||||
select item;
|
|
||||||
|
|
||||||
private IEnumerable<YahooAuctionsItem> outdatedItemQuery =>
|
|
||||||
// only returns items that meet all of the following:
|
|
||||||
// - marked as "ready", as in, they aren't in the process of updating
|
|
||||||
// - not updated since the interval
|
|
||||||
// - hasn't already ended
|
|
||||||
from item in settings.watchlist.Values.ToList()
|
|
||||||
where item.Ready && settings.ItemNotUpdatedSinceInterval(item) && item.endDate.CompareTo(DateTime.UtcNow) > 0
|
|
||||||
select item;
|
|
||||||
|
|
||||||
private YahooAuctionsItem selectedItem {
|
|
||||||
get {
|
|
||||||
if (itemTreeView.Selection.CountSelectedRows() == 0) {
|
|
||||||
// avoids incurring the wrath of Gtk-CRITICAL **
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
itemTreeView.Selection.GetSelected(out var iter);
|
|
||||||
return (YahooAuctionsItem) itemTreeView.Model.GetValue(iter, 0);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public MainWindow() : this(new Builder("main.glade")) {
|
public MainWindow() : this(new Builder("main.glade")) {
|
||||||
}
|
}
|
||||||
|
@ -108,16 +72,20 @@ namespace Buypeeb {
|
||||||
Encoder = JavaScriptEncoder.Create(UnicodeRanges.All),
|
Encoder = JavaScriptEncoder.Create(UnicodeRanges.All),
|
||||||
};
|
};
|
||||||
|
|
||||||
if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
|
if (Environment.OSVersion.Platform ==
|
||||||
// C:\Users\Beebus\AppData\Roaming\Lynnear Software\buypeeb
|
PlatformID.Win32NT) // C:\Users\Beebus\AppData\Roaming\Lynnear Software\buypeeb
|
||||||
|
{
|
||||||
location = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
location = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
"Lynnear Software", "buypeeb");
|
"Lynnear Software", "buypeeb");
|
||||||
} else {
|
} else // ~/.config/Lynnear Software/buypeeb
|
||||||
// ~/.config/Lynnear Software/buypeeb
|
{
|
||||||
location = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".config",
|
location = System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".config",
|
||||||
"Lynnear Software", "buypeeb");
|
"Lynnear Software", "buypeeb");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// initialise http client
|
||||||
|
httpClient = new HttpClient();
|
||||||
|
|
||||||
var userdata = System.IO.Path.Combine(location, "userdata.json");
|
var userdata = System.IO.Path.Combine(location, "userdata.json");
|
||||||
if (File.Exists(userdata)) {
|
if (File.Exists(userdata)) {
|
||||||
try {
|
try {
|
||||||
|
@ -188,6 +156,43 @@ namespace Buypeeb {
|
||||||
DeleteEvent += WindowShutdown;
|
DeleteEvent += WindowShutdown;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private IEnumerable<YahooAuctionsItem> filterQuery =>
|
||||||
|
// father forgive me for i have lynned
|
||||||
|
from item in settings.watchlist.Values.ToList()
|
||||||
|
where (item.favourite != filterChecks["Favourites"].Active ||
|
||||||
|
item.favourite == filterChecks["NonFavourites"].Active) &&
|
||||||
|
(item.Available != filterChecks["Active"].Active ||
|
||||||
|
item.Available == filterChecks["Ended"].Active) &&
|
||||||
|
(item.endingToday != filterChecks["EndingToday"].Active ||
|
||||||
|
item.endingToday == filterChecks["EndingAfterToday"].Active) &&
|
||||||
|
(item.hasWinPrice != filterChecks["WithWinPrice"].Active ||
|
||||||
|
item.hasWinPrice == filterChecks["WithNoWinPrice"].Active) &&
|
||||||
|
(string.IsNullOrWhiteSpace(searchEntry.Text) ||
|
||||||
|
item.name.ToLower().Contains(searchEntry.Text.ToLower()) ||
|
||||||
|
item.originalName.ToLower().Contains(searchEntry.Text.ToLower()))
|
||||||
|
select item;
|
||||||
|
|
||||||
|
private IEnumerable<YahooAuctionsItem> outdatedItemQuery =>
|
||||||
|
// only returns items that meet all of the following:
|
||||||
|
// - marked as "ready", as in, they aren't in the process of updating
|
||||||
|
// - not updated since the interval
|
||||||
|
// - hasn't already ended
|
||||||
|
from item in settings.watchlist.Values.ToList()
|
||||||
|
where item.Ready && settings.ItemNotUpdatedSinceInterval(item) && item.endDate.CompareTo(DateTime.UtcNow) > 0
|
||||||
|
select item;
|
||||||
|
|
||||||
|
private YahooAuctionsItem selectedItem {
|
||||||
|
get {
|
||||||
|
if (itemTreeView.Selection.CountSelectedRows() == 0) // avoids incurring the wrath of Gtk-CRITICAL **
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
itemTreeView.Selection.GetSelected(out var iter);
|
||||||
|
return (YahooAuctionsItem) itemTreeView.Model.GetValue(iter, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void WindowShutdown(object sender, DeleteEventArgs args) {
|
private void WindowShutdown(object sender, DeleteEventArgs args) {
|
||||||
SaveSettings();
|
SaveSettings();
|
||||||
Application.Quit();
|
Application.Quit();
|
||||||
|
@ -237,7 +242,7 @@ namespace Buypeeb {
|
||||||
/// updates the item with the given id. this method blocks and is intended to be run from a task.
|
/// updates the item with the given id. this method blocks and is intended to be run from a task.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="id">the id of the item to update</param>
|
/// <param name="id">the id of the item to update</param>
|
||||||
private void UpdateThread(string id) {
|
private async void UpdateThread(string id) {
|
||||||
var item = settings.watchlist[id];
|
var item = settings.watchlist[id];
|
||||||
// Console.WriteLine($"Updating {id}...");
|
// Console.WriteLine($"Updating {id}...");
|
||||||
// set item.ready to false to show that it's still being updated
|
// set item.ready to false to show that it's still being updated
|
||||||
|
@ -253,18 +258,13 @@ namespace Buypeeb {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
using (var client = new WebClient()) {
|
|
||||||
// TODO: download should have timeout
|
|
||||||
try {
|
try {
|
||||||
// item.Update(client.DownloadString("http://10.0.0.10/poop"));
|
item.Update(await httpClient.GetStringAsync(item.url));
|
||||||
item.Update(client.DownloadString(item.url));
|
} catch (HttpRequestException e) {
|
||||||
} catch (WebException e) {
|
if (e.StatusCode == HttpStatusCode.NotFound) {
|
||||||
if (((HttpWebResponse) e.Response).StatusCode == HttpStatusCode.NotFound) {
|
|
||||||
// the auction has ended (or otherwise been removed)
|
|
||||||
item.AuctionEnded();
|
item.AuctionEnded();
|
||||||
} else {
|
} else {
|
||||||
Console.WriteLine($"Failed to update item ${id}!");
|
Console.WriteLine($"Failed to update item ${id}! Status code ${e.StatusCode}: ${e.Message}");
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -416,11 +416,11 @@ namespace Buypeeb {
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
private MessageDialog MsgBox(string message, ButtonsType buttonsType = ButtonsType.OkCancel) {
|
private MessageDialog MsgBox(string message, ButtonsType buttonsType = ButtonsType.OkCancel) {
|
||||||
var md = new MessageDialog(
|
var md = new MessageDialog(
|
||||||
parent_window: this,
|
this,
|
||||||
flags: DialogFlags.DestroyWithParent | DialogFlags.Modal,
|
DialogFlags.DestroyWithParent | DialogFlags.Modal,
|
||||||
type: MessageType.Question,
|
MessageType.Question,
|
||||||
bt: buttonsType,
|
buttonsType,
|
||||||
format: message
|
message
|
||||||
) {KeepAbove = true, Resizable = false, FocusOnMap = true, Title = "Buypeeb"};
|
) {KeepAbove = true, Resizable = false, FocusOnMap = true, Title = "Buypeeb"};
|
||||||
|
|
||||||
return md;
|
return md;
|
||||||
|
@ -437,9 +437,9 @@ namespace Buypeeb {
|
||||||
string title = "Buypeeb", string message = "Hi there!", string prefill = null
|
string title = "Buypeeb", string message = "Hi there!", string prefill = null
|
||||||
) {
|
) {
|
||||||
var ed = new Dialog(
|
var ed = new Dialog(
|
||||||
title: title,
|
title,
|
||||||
parent: this,
|
this,
|
||||||
flags: DialogFlags.DestroyWithParent | DialogFlags.Modal,
|
DialogFlags.DestroyWithParent | DialogFlags.Modal,
|
||||||
/* button_data: */ "Cancel", ResponseType.Cancel, "OK", ResponseType.Ok
|
/* button_data: */ "Cancel", ResponseType.Cancel, "OK", ResponseType.Ok
|
||||||
) {DefaultResponse = ResponseType.Ok, KeepAbove = true};
|
) {DefaultResponse = ResponseType.Ok, KeepAbove = true};
|
||||||
|
|
||||||
|
@ -498,21 +498,15 @@ namespace Buypeeb {
|
||||||
|
|
||||||
items.Clear();
|
items.Clear();
|
||||||
var values = settings.watchlist.Values;
|
var values = settings.watchlist.Values;
|
||||||
IOrderedEnumerable<YahooAuctionsItem> sorted;
|
|
||||||
var type = GetSortType();
|
var type = GetSortType();
|
||||||
if (type == "NameDescending") {
|
var sorted = type switch {
|
||||||
sorted = values.OrderByDescending(item => item.name);
|
"NameDescending" => values.OrderByDescending(item => item.name),
|
||||||
} else if (type == "NameAscending") {
|
"NameAscending" => values.OrderBy(item => item.name),
|
||||||
sorted = values.OrderBy(item => item.name);
|
"PriceDescending" => values.OrderByDescending(item => item.Price),
|
||||||
} else if (type == "PriceDescending") {
|
"PriceAscending" => values.OrderBy(item => item.Price),
|
||||||
sorted = values.OrderByDescending(item => item.Price);
|
"EndingDescending" => values.OrderByDescending(item => item.endDate),
|
||||||
} else if (type == "PriceAscending") {
|
_ => values.OrderBy(item => item.endDate),
|
||||||
sorted = values.OrderBy(item => item.Price);
|
};
|
||||||
} else if (type == "EndingDescending") {
|
|
||||||
sorted = values.OrderByDescending(item => item.endDate);
|
|
||||||
} else {
|
|
||||||
sorted = values.OrderBy(item => item.endDate);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (settings.showFavouritesAtTopOfList) {
|
if (settings.showFavouritesAtTopOfList) {
|
||||||
foreach (var item in sorted.Where(item => item.favourite)) {
|
foreach (var item in sorted.Where(item => item.favourite)) {
|
||||||
|
@ -603,9 +597,9 @@ namespace Buypeeb {
|
||||||
|
|
||||||
private void ButtonOpenClicked(object sender, EventArgs a) {
|
private void ButtonOpenClicked(object sender, EventArgs a) {
|
||||||
var od = new FileChooserDialog(
|
var od = new FileChooserDialog(
|
||||||
title: "Open userdata.json",
|
"Open userdata.json",
|
||||||
parent: this,
|
this,
|
||||||
action: FileChooserAction.Open,
|
FileChooserAction.Open,
|
||||||
"Cancel", ResponseType.Cancel, "Open", ResponseType.Accept
|
"Cancel", ResponseType.Cancel, "Open", ResponseType.Accept
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -637,9 +631,9 @@ namespace Buypeeb {
|
||||||
|
|
||||||
private void ButtonSaveAsClicked(object sender, EventArgs a) {
|
private void ButtonSaveAsClicked(object sender, EventArgs a) {
|
||||||
var sd = new FileChooserDialog(
|
var sd = new FileChooserDialog(
|
||||||
title: "Save userdata.json",
|
"Save userdata.json",
|
||||||
parent: this,
|
this,
|
||||||
action: FileChooserAction.Save,
|
FileChooserAction.Save,
|
||||||
"Cancel", ResponseType.Cancel, "Save", ResponseType.Accept
|
"Cancel", ResponseType.Cancel, "Save", ResponseType.Accept
|
||||||
) {CurrentName = "userdata.json"};
|
) {CurrentName = "userdata.json"};
|
||||||
|
|
||||||
|
@ -676,9 +670,9 @@ namespace Buypeeb {
|
||||||
}
|
}
|
||||||
|
|
||||||
var sd = new FileChooserDialog(
|
var sd = new FileChooserDialog(
|
||||||
title: "Export watchlist as CSV",
|
"Export watchlist as CSV",
|
||||||
parent: this,
|
this,
|
||||||
action: FileChooserAction.Save,
|
FileChooserAction.Save,
|
||||||
"Cancel", ResponseType.Cancel, "Save", ResponseType.Accept
|
"Cancel", ResponseType.Cancel, "Save", ResponseType.Accept
|
||||||
) {CurrentName = "buypeeb.csv"};
|
) {CurrentName = "buypeeb.csv"};
|
||||||
|
|
||||||
|
@ -753,9 +747,7 @@ namespace Buypeeb {
|
||||||
private void ButtonSelectedRemoveClicked(object sender, EventArgs a) {
|
private void ButtonSelectedRemoveClicked(object sender, EventArgs a) {
|
||||||
var item = selectedItem;
|
var item = selectedItem;
|
||||||
|
|
||||||
var md = MsgBox(
|
var md = MsgBox($"Are you sure you want to remove the item \"{item.name}\"?");
|
||||||
$"Are you sure you want to remove the item \"{item.name}\"?"
|
|
||||||
);
|
|
||||||
|
|
||||||
var response = (ResponseType) md.Run();
|
var response = (ResponseType) md.Run();
|
||||||
md.Dispose();
|
md.Dispose();
|
||||||
|
@ -815,7 +807,8 @@ namespace Buypeeb {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void TextViewSelectedNotesFocusOut(object sender, FocusOutEventArgs args) {
|
private void TextViewSelectedNotesFocusOut(object sender, FocusOutEventArgs args) {
|
||||||
// the "save" button does nothing, however, when you click the save button, you transfer focus to it, firing this event!
|
// the "save" button does nothing, however, when you click the save button, you transfer focus to it, firing this
|
||||||
|
// event!
|
||||||
// how very sneaky
|
// how very sneaky
|
||||||
var noteBuffer = (TextBuffer) builder.GetObject("TextBufferSelectedNotes");
|
var noteBuffer = (TextBuffer) builder.GetObject("TextBufferSelectedNotes");
|
||||||
if (selectedItem != null) {
|
if (selectedItem != null) {
|
||||||
|
@ -965,10 +958,10 @@ namespace Buypeeb {
|
||||||
// first, check to see if any filters are set that would exclude everything, such as hiding both active and ended auctions
|
// first, check to see if any filters are set that would exclude everything, such as hiding both active and ended auctions
|
||||||
// if so, there's no need to run the more expensive linq query
|
// if so, there's no need to run the more expensive linq query
|
||||||
if (
|
if (
|
||||||
(Filtered("Favourites") && Filtered("NonFavourites")) ||
|
Filtered("Favourites") && Filtered("NonFavourites") ||
|
||||||
(Filtered("Active") && Filtered("Ended")) ||
|
Filtered("Active") && Filtered("Ended") ||
|
||||||
(Filtered("EndingToday") && Filtered("EndingAfterToday")) ||
|
Filtered("EndingToday") && Filtered("EndingAfterToday") ||
|
||||||
(Filtered("WithWinPrice") && Filtered("WithNoWinPrice"))
|
Filtered("WithWinPrice") && Filtered("WithNoWinPrice")
|
||||||
) {
|
) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
12
Settings.cs
12
Settings.cs
|
@ -3,6 +3,12 @@ using System.Collections.Generic;
|
||||||
|
|
||||||
namespace Buypeeb {
|
namespace Buypeeb {
|
||||||
internal class Settings {
|
internal class Settings {
|
||||||
|
public Settings() {
|
||||||
|
// create a new watchlist from an empty dictionary if it's null, which should only happen if either this is the
|
||||||
|
// first time the program has been run, or there's something wrong with userdata.json
|
||||||
|
watchlist ??= new Dictionary<string, YahooAuctionsItem>();
|
||||||
|
}
|
||||||
|
|
||||||
public int updateInterval { get; set; } = 10 * 60;
|
public int updateInterval { get; set; } = 10 * 60;
|
||||||
public int favouriteUpdateInterval { get; set; } = 5 * 60;
|
public int favouriteUpdateInterval { get; set; } = 5 * 60;
|
||||||
public int updateIntervalCritical { get; set; } = 60;
|
public int updateIntervalCritical { get; set; } = 60;
|
||||||
|
@ -13,12 +19,6 @@ namespace Buypeeb {
|
||||||
|
|
||||||
public Dictionary<string, YahooAuctionsItem> watchlist { get; set; }
|
public Dictionary<string, YahooAuctionsItem> watchlist { get; set; }
|
||||||
|
|
||||||
public Settings() {
|
|
||||||
// create a new watchlist from an empty dictionary if it's null, which should only happen if either this is the
|
|
||||||
// first time the program has been run, or there's something wrong with userdata.json
|
|
||||||
watchlist ??= new Dictionary<string, YahooAuctionsItem>();
|
|
||||||
}
|
|
||||||
|
|
||||||
public YahooAuctionsItem Watch(string url, string name) {
|
public YahooAuctionsItem Watch(string url, string name) {
|
||||||
var id = BuypeebApp.IDFromURL(url);
|
var id = BuypeebApp.IDFromURL(url);
|
||||||
Console.WriteLine(id);
|
Console.WriteLine(id);
|
||||||
|
|
|
@ -7,19 +7,19 @@ using Gtk;
|
||||||
|
|
||||||
namespace Buypeeb {
|
namespace Buypeeb {
|
||||||
internal class SettingsWindow : Window {
|
internal class SettingsWindow : Window {
|
||||||
private readonly List<Switch> generalSwitches = new List<Switch>();
|
|
||||||
private readonly List<Entry> updateIntervalEntries = new List<Entry>();
|
|
||||||
private readonly Settings settings;
|
|
||||||
private readonly Builder builder;
|
private readonly Builder builder;
|
||||||
|
private readonly List<Switch> generalSwitches = new();
|
||||||
|
|
||||||
private readonly List<string> generalSwitchNames = new List<string>
|
private readonly List<string> generalSwitchNames =
|
||||||
{"ShowSecondsInListView", "Autosave", "ShowFavouritesAtTopOfList"};
|
new() {"ShowSecondsInListView", "Autosave", "ShowFavouritesAtTopOfList"};
|
||||||
|
|
||||||
private readonly List<string> updateIntervalEntryNames = new List<string>
|
private readonly Settings settings;
|
||||||
|
private readonly List<Entry> updateIntervalEntries = new();
|
||||||
|
|
||||||
|
private readonly List<string> updateIntervalEntryNames = new()
|
||||||
{"UpdateInterval", "UpdateIntervalCritical", "FavouriteUpdateInterval", "FavouriteUpdateIntervalCritical"};
|
{"UpdateInterval", "UpdateIntervalCritical", "FavouriteUpdateInterval", "FavouriteUpdateIntervalCritical"};
|
||||||
|
|
||||||
public SettingsWindow(Settings settings) : this(new Builder("settings.glade"), settings) {
|
public SettingsWindow(Settings settings) : this(new Builder("settings.glade"), settings) { }
|
||||||
}
|
|
||||||
|
|
||||||
private SettingsWindow(Builder builder, Settings settings) : base(builder.GetObject("WindowSettings").Handle) {
|
private SettingsWindow(Builder builder, Settings settings) : base(builder.GetObject("WindowSettings").Handle) {
|
||||||
Title = "Buypeeb - Settings";
|
Title = "Buypeeb - Settings";
|
||||||
|
@ -41,11 +41,11 @@ namespace Buypeeb {
|
||||||
}
|
}
|
||||||
|
|
||||||
private T GetSetting<T>(string property) {
|
private T GetSetting<T>(string property) {
|
||||||
return (T) settings.GetType().GetProperty(property).GetValue(settings, null);
|
return (T) settings.GetType().GetProperty(property)?.GetValue(settings, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetSetting<T>(string property, T value) {
|
private void SetSetting<T>(string property, T value) {
|
||||||
settings.GetType().GetProperty(property).SetValue(settings, value);
|
settings.GetType().GetProperty(property)?.SetValue(settings, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
private string PropertyName(string property) {
|
private string PropertyName(string property) {
|
||||||
|
@ -93,5 +93,11 @@ namespace Buypeeb {
|
||||||
private void ButtonCancelClicked(object sender, EventArgs args) {
|
private void ButtonCancelClicked(object sender, EventArgs args) {
|
||||||
Dispose();
|
Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void ButtonAboutClicked(object sender, EventArgs args) {
|
||||||
|
var win = new AboutDialogue();
|
||||||
|
Application.AddWindow(win);
|
||||||
|
win.Show();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Diagnostics;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
@ -9,6 +10,25 @@ using CsvHelper.Configuration.Attributes;
|
||||||
|
|
||||||
namespace Buypeeb {
|
namespace Buypeeb {
|
||||||
internal class YahooAuctionsItem {
|
internal class YahooAuctionsItem {
|
||||||
|
public bool AutoExtension;
|
||||||
|
public bool Available;
|
||||||
|
public int Bids;
|
||||||
|
public DateTime LastUpdated;
|
||||||
|
public int Price;
|
||||||
|
public bool Ready;
|
||||||
|
public DateTime StartDate;
|
||||||
|
public bool UpdateFailed;
|
||||||
|
public int WinPrice;
|
||||||
|
|
||||||
|
public YahooAuctionsItem(string id, string name) {
|
||||||
|
this.id = id;
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public YahooAuctionsItem() {
|
||||||
|
// parameterless constructor for deserialisation
|
||||||
|
}
|
||||||
|
|
||||||
[JsonIgnore] public string url => $"https://page.auctions.yahoo.co.jp/jp/auction/{id}";
|
[JsonIgnore] public string url => $"https://page.auctions.yahoo.co.jp/jp/auction/{id}";
|
||||||
|
|
||||||
[JsonIgnore] public string buyeeUrl => $"https://buyee.jp/item/yahoo/auction/{id}";
|
[JsonIgnore] public string buyeeUrl => $"https://buyee.jp/item/yahoo/auction/{id}";
|
||||||
|
@ -25,21 +45,13 @@ namespace Buypeeb {
|
||||||
// you also don't want to private any of the setters, which will have a similar effect.
|
// you also don't want to private any of the setters, which will have a similar effect.
|
||||||
[Ignore] public string id { get; set; }
|
[Ignore] public string id { get; set; }
|
||||||
public string name { get; set; }
|
public string name { get; set; }
|
||||||
public int Price;
|
|
||||||
public int WinPrice;
|
|
||||||
public string originalName { get; set; }
|
public string originalName { get; set; }
|
||||||
public string notes { get; set; }
|
public string notes { get; set; }
|
||||||
public bool favourite { get; set; }
|
public bool favourite { get; set; }
|
||||||
public DateTime StartDate;
|
|
||||||
public DateTime endDate { get; set; }
|
public DateTime endDate { get; set; }
|
||||||
public DateTime LastUpdated;
|
|
||||||
public int Bids;
|
|
||||||
public bool AutoExtension;
|
|
||||||
public bool Ready;
|
|
||||||
public bool Available;
|
|
||||||
public bool UpdateFailed;
|
|
||||||
|
|
||||||
[Ignore, JsonIgnore]
|
[Ignore]
|
||||||
|
[JsonIgnore]
|
||||||
public bool updatedRecently {
|
public bool updatedRecently {
|
||||||
get {
|
get {
|
||||||
var later = LastUpdated.AddSeconds(15);
|
var later = LastUpdated.AddSeconds(15);
|
||||||
|
@ -51,27 +63,18 @@ namespace Buypeeb {
|
||||||
|
|
||||||
[JsonIgnore] public string winPriceJpy => $"¥{WinPrice}";
|
[JsonIgnore] public string winPriceJpy => $"¥{WinPrice}";
|
||||||
|
|
||||||
[Ignore, JsonIgnore] public string priceAud => $"${(Price / 75.0):f2}";
|
[Ignore] [JsonIgnore] public string priceAud => $"${Price / 75.0:f2}";
|
||||||
|
|
||||||
[Ignore, JsonIgnore] public string winPriceAud => $"${(WinPrice / 75.0):f2}";
|
[Ignore] [JsonIgnore] public string winPriceAud => $"${WinPrice / 75.0:f2}";
|
||||||
|
|
||||||
[Ignore, JsonIgnore] public bool endingToday => endDate.DayOfYear == DateTime.UtcNow.DayOfYear;
|
[Ignore] [JsonIgnore] public bool endingToday => endDate.DayOfYear == DateTime.UtcNow.DayOfYear;
|
||||||
|
|
||||||
[Ignore, JsonIgnore] public bool hasWinPrice => WinPrice != 0;
|
[Ignore] [JsonIgnore] public bool hasWinPrice => WinPrice != 0;
|
||||||
|
|
||||||
[Ignore, JsonIgnore] public bool endingSoon => DateTime.Compare(DateTime.UtcNow.AddMinutes(10), endDate) > 0;
|
[Ignore] [JsonIgnore] public bool endingSoon => DateTime.Compare(DateTime.UtcNow.AddMinutes(10), endDate) > 0;
|
||||||
|
|
||||||
private bool success { get; set; } // TODO: custom setter that throws an exception if set to false or something idk
|
private bool success { get; set; } // TODO: custom setter that throws an exception if set to false or something idk
|
||||||
|
|
||||||
public YahooAuctionsItem(string id, string name) {
|
|
||||||
this.id = id;
|
|
||||||
this.name = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public YahooAuctionsItem() {
|
|
||||||
// parameterless constructor for deserialisation
|
|
||||||
}
|
|
||||||
|
|
||||||
public void AuctionEnded() {
|
public void AuctionEnded() {
|
||||||
// the page 404'd. this probably means that the auction has ended, and the page has been removed.
|
// the page 404'd. this probably means that the auction has ended, and the page has been removed.
|
||||||
Available = false;
|
Available = false;
|
||||||
|
@ -81,8 +84,8 @@ namespace Buypeeb {
|
||||||
|
|
||||||
public void Update(string html) {
|
public void Update(string html) {
|
||||||
// TODO: handle all the parsing errors and weird interpretation that could possibly happen here
|
// TODO: handle all the parsing errors and weird interpretation that could possibly happen here
|
||||||
var rx = new Regex(@"var pageData ?= ?(\{.+?\});",
|
// TODO: maybe compile and match the regex in another thread
|
||||||
RegexOptions.Singleline); // TODO: maybe compile and match the regex in another thread
|
var rx = new Regex(@"var pageData ?= ?(\{.+?\});", RegexOptions.Singleline);
|
||||||
var m = rx.Match(html);
|
var m = rx.Match(html);
|
||||||
|
|
||||||
Dictionary<string, Dictionary<string, string>> jFull;
|
Dictionary<string, Dictionary<string, string>> jFull;
|
||||||
|
@ -98,6 +101,7 @@ namespace Buypeeb {
|
||||||
var jst = TimeZoneInfo.CreateCustomTimeZone("JST", new TimeSpan(9, 0, 0), "Japan Standard Time",
|
var jst = TimeZoneInfo.CreateCustomTimeZone("JST", new TimeSpan(9, 0, 0), "Japan Standard Time",
|
||||||
"Japan Standard Time");
|
"Japan Standard Time");
|
||||||
|
|
||||||
|
Debug.Assert(jFull != null, nameof(jFull) + " != null");
|
||||||
var j = jFull["items"];
|
var j = jFull["items"];
|
||||||
originalName = j["productName"];
|
originalName = j["productName"];
|
||||||
StartDate = TimeZoneInfo.ConvertTimeToUtc(
|
StartDate = TimeZoneInfo.ConvertTimeToUtc(
|
||||||
|
@ -122,7 +126,7 @@ namespace Buypeeb {
|
||||||
// whether or not it's equal to "ari" (japanese for "yes").
|
// whether or not it's equal to "ari" (japanese for "yes").
|
||||||
rx = new Regex(@"自動延長.+\n.+>(.+)<");
|
rx = new Regex(@"自動延長.+\n.+>(.+)<");
|
||||||
m = rx.Match(html);
|
m = rx.Match(html);
|
||||||
AutoExtension = (m.Groups[1].Value == "あり");
|
AutoExtension = m.Groups[1].Value == "あり";
|
||||||
|
|
||||||
UpdateFailed = false;
|
UpdateFailed = false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,16 +7,25 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Remove="**\*.glade" />
|
<None Remove="**\*.glade"/>
|
||||||
<EmbeddedResource Include="**\*.glade">
|
<EmbeddedResource Include="**\*.glade">
|
||||||
<LogicalName>%(Filename)%(Extension)</LogicalName>
|
<LogicalName>%(Filename)%(Extension)</LogicalName>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<None Remove="yahoo.html" />
|
<None Remove="yahoo.html"/>
|
||||||
|
<EmbeddedResource Remove="obj\**"/>
|
||||||
|
<None Remove="obj\**"/>
|
||||||
|
<EmbeddedResource Remove="out\**"/>
|
||||||
|
<None Remove="out\**"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="CsvHelper" Version="27.1.0" />
|
<PackageReference Include="CsvHelper" Version="27.1.1"/>
|
||||||
<PackageReference Include="GtkSharp" Version="3.24.24.34" />
|
<PackageReference Include="GtkSharp" Version="3.24.24.34"/>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Remove="obj\**"/>
|
||||||
|
<Compile Remove="out\**"/>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|
44
ui/about.glade
Normal file
44
ui/about.glade
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!-- Generated with glade 3.38.2 -->
|
||||||
|
<interface>
|
||||||
|
<requires lib="gtk+" version="3.24"/>
|
||||||
|
<object class="GtkAboutDialog" id="DialogueAbout">
|
||||||
|
<property name="can-focus">False</property>
|
||||||
|
<property name="title" translatable="yes">About Buypeeb</property>
|
||||||
|
<property name="modal">True</property>
|
||||||
|
<property name="window-position">center-on-parent</property>
|
||||||
|
<property name="destroy-with-parent">True</property>
|
||||||
|
<property name="type-hint">dialog</property>
|
||||||
|
<property name="program-name">Buypeeb</property>
|
||||||
|
<property name="version">1.0</property>
|
||||||
|
<property name="website">https://git.bune.city/lynnesbian/buypeeb-cs</property>
|
||||||
|
<property name="authors">Lynnesbian</property>
|
||||||
|
<property name="logo-icon-name">dialog-information</property>
|
||||||
|
<property name="license-type">gpl-3-0-only</property>
|
||||||
|
<signal name="response" handler="ButtonCloseClicked" swapped="no"/>
|
||||||
|
<child internal-child="vbox">
|
||||||
|
<object class="GtkBox">
|
||||||
|
<property name="width-request">-1</property>
|
||||||
|
<property name="can-focus">False</property>
|
||||||
|
<property name="halign">center</property>
|
||||||
|
<property name="valign">center</property>
|
||||||
|
<property name="orientation">vertical</property>
|
||||||
|
<property name="spacing">2</property>
|
||||||
|
<child internal-child="action_area">
|
||||||
|
<object class="GtkButtonBox">
|
||||||
|
<property name="can-focus">False</property>
|
||||||
|
<property name="layout-style">end</property>
|
||||||
|
</object>
|
||||||
|
<packing>
|
||||||
|
<property name="expand">False</property>
|
||||||
|
<property name="fill">False</property>
|
||||||
|
<property name="position">0</property>
|
||||||
|
</packing>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<placeholder/>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</child>
|
||||||
|
</object>
|
||||||
|
</interface>
|
73
ui/add.glade
73
ui/add.glade
|
@ -1,37 +1,34 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!-- Generated with glade 3.22.2 -->
|
<!-- Generated with glade 3.38.2 -->
|
||||||
<interface>
|
<interface>
|
||||||
<requires lib="gtk+" version="3.22"/>
|
<requires lib="gtk+" version="3.22"/>
|
||||||
<object class="GtkDialog" id="DialogueAdd">
|
<object class="GtkDialog" id="DialogueAdd">
|
||||||
<property name="can_focus">False</property>
|
<property name="can-focus">False</property>
|
||||||
<property name="resizable">False</property>
|
<property name="resizable">False</property>
|
||||||
<property name="modal">True</property>
|
<property name="modal">True</property>
|
||||||
<property name="window_position">center-on-parent</property>
|
<property name="window-position">center-on-parent</property>
|
||||||
<property name="default_width">320</property>
|
<property name="default-width">320</property>
|
||||||
<property name="destroy_with_parent">True</property>
|
<property name="destroy-with-parent">True</property>
|
||||||
<property name="type_hint">dialog</property>
|
<property name="type-hint">dialog</property>
|
||||||
<property name="gravity">center</property>
|
<property name="gravity">center</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>
|
||||||
<property name="margin_start">5</property>
|
<property name="margin-start">5</property>
|
||||||
<property name="margin_end">5</property>
|
<property name="margin-end">5</property>
|
||||||
<property name="orientation">vertical</property>
|
<property name="orientation">vertical</property>
|
||||||
<property name="spacing">2</property>
|
<property name="spacing">2</property>
|
||||||
<child internal-child="action_area">
|
<child internal-child="action_area">
|
||||||
<object class="GtkButtonBox">
|
<object class="GtkButtonBox">
|
||||||
<property name="can_focus">False</property>
|
<property name="can-focus">False</property>
|
||||||
<property name="margin_bottom">5</property>
|
<property name="margin-bottom">5</property>
|
||||||
<property name="layout_style">end</property>
|
<property name="layout-style">end</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkButton" id="ButtonAddCancel">
|
<object class="GtkButton" id="ButtonAddCancel">
|
||||||
<property name="label" translatable="yes">Cancel</property>
|
<property name="label" translatable="yes">Cancel</property>
|
||||||
<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>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">True</property>
|
<property name="expand">True</property>
|
||||||
|
@ -43,10 +40,10 @@
|
||||||
<object class="GtkButton" id="ButtonAddOK">
|
<object class="GtkButton" id="ButtonAddOK">
|
||||||
<property name="label" translatable="yes">OK</property>
|
<property name="label" translatable="yes">OK</property>
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can-focus">True</property>
|
||||||
<property name="can_default">True</property>
|
<property name="can-default">True</property>
|
||||||
<property name="has_default">True</property>
|
<property name="has-default">True</property>
|
||||||
<property name="receives_default">True</property>
|
<property name="receives-default">True</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">True</property>
|
<property name="expand">True</property>
|
||||||
|
@ -64,15 +61,15 @@
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkBox">
|
<object class="GtkBox">
|
||||||
<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_top">5</property>
|
<property name="margin-top">5</property>
|
||||||
<property name="margin_bottom">5</property>
|
<property name="margin-bottom">5</property>
|
||||||
<property name="orientation">vertical</property>
|
<property name="orientation">vertical</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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_bottom">5</property>
|
<property name="margin-bottom">5</property>
|
||||||
<property name="label" translatable="yes">Add item</property>
|
<property name="label" translatable="yes">Add item</property>
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="weight" value="bold"/>
|
<attribute name="weight" value="bold"/>
|
||||||
|
@ -88,7 +85,7 @@
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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">Enter the URL of the item you want to add.</property>
|
<property name="label" translatable="yes">Enter the URL of the item you want to add.</property>
|
||||||
</object>
|
</object>
|
||||||
|
@ -101,12 +98,12 @@
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkEntry" id="EntryAddURL">
|
<object class="GtkEntry" id="EntryAddURL">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can-focus">True</property>
|
||||||
<property name="margin_top">5</property>
|
<property name="margin-top">5</property>
|
||||||
<property name="margin_bottom">10</property>
|
<property name="margin-bottom">10</property>
|
||||||
<property name="activates_default">True</property>
|
<property name="activates-default">True</property>
|
||||||
<property name="placeholder_text" translatable="yes">URL</property>
|
<property name="placeholder-text" translatable="yes">URL</property>
|
||||||
<property name="input_purpose">url</property>
|
<property name="input-purpose">url</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
|
@ -117,7 +114,7 @@
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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">You may also enter a custom name below.</property>
|
<property name="label" translatable="yes">You may also enter a custom name below.</property>
|
||||||
</object>
|
</object>
|
||||||
|
@ -130,10 +127,10 @@
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkEntry" id="EntryAddName">
|
<object class="GtkEntry" id="EntryAddName">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can-focus">True</property>
|
||||||
<property name="margin_top">5</property>
|
<property name="margin-top">5</property>
|
||||||
<property name="activates_default">True</property>
|
<property name="activates-default">True</property>
|
||||||
<property name="placeholder_text" translatable="yes">Name (optional)</property>
|
<property name="placeholder-text" translatable="yes">Name (optional)</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
|
|
511
ui/main.glade
511
ui/main.glade
File diff suppressed because it is too large
Load diff
|
@ -1,294 +1,302 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!-- Generated with glade 3.22.2 -->
|
<!-- Generated with glade 3.38.2 -->
|
||||||
<interface>
|
<interface>
|
||||||
<requires lib="gtk+" version="3.20"/>
|
<requires lib="gtk+" version="3.20"/>
|
||||||
<object class="GtkWindow" id="WindowSettings">
|
<object class="GtkWindow" id="WindowSettings">
|
||||||
<property name="can_focus">False</property>
|
<property name="can-focus">False</property>
|
||||||
<property name="modal">True</property>
|
<property name="modal">True</property>
|
||||||
<property name="default_width">440</property>
|
<property name="default-width">440</property>
|
||||||
<child type="titlebar">
|
|
||||||
<placeholder/>
|
|
||||||
</child>
|
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkBox">
|
<object class="GtkBox">
|
||||||
<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">5</property>
|
<property name="margin-left">5</property>
|
||||||
<property name="margin_right">5</property>
|
<property name="margin-right">5</property>
|
||||||
<property name="margin_top">5</property>
|
<property name="margin-top">5</property>
|
||||||
<property name="margin_bottom">5</property>
|
<property name="margin-bottom">5</property>
|
||||||
<property name="orientation">vertical</property>
|
<property name="orientation">vertical</property>
|
||||||
<property name="spacing">5</property>
|
<property name="spacing">5</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkNotebook">
|
<object class="GtkNotebook">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can-focus">True</property>
|
||||||
<property name="vexpand">True</property>
|
<property name="vexpand">True</property>
|
||||||
<child>
|
<child>
|
||||||
|
<!-- n-columns=3 n-rows=3 -->
|
||||||
<object class="GtkGrid">
|
<object class="GtkGrid">
|
||||||
<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">5</property>
|
<property name="margin-left">5</property>
|
||||||
<property name="margin_right">5</property>
|
<property name="margin-right">5</property>
|
||||||
<property name="margin_top">5</property>
|
<property name="margin-top">5</property>
|
||||||
<property name="margin_bottom">5</property>
|
<property name="margin-bottom">5</property>
|
||||||
<property name="row_spacing">5</property>
|
<property name="row-spacing">5</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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="hexpand">True</property>
|
<property name="hexpand">True</property>
|
||||||
<property name="label" translatable="yes">Show seconds in list view</property>
|
<property name="label" translatable="yes">Show seconds in list view</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">0</property>
|
<property name="left-attach">0</property>
|
||||||
<property name="top_attach">0</property>
|
<property name="top-attach">0</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkSwitch" id="SwitchShowSecondsInListView">
|
<object class="GtkSwitch" id="SwitchShowSecondsInListView">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can-focus">True</property>
|
||||||
<property name="halign">end</property>
|
<property name="halign">end</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">1</property>
|
<property name="left-attach">1</property>
|
||||||
<property name="top_attach">0</property>
|
<property name="top-attach">0</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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="hexpand">True</property>
|
<property name="hexpand">True</property>
|
||||||
<property name="label" translatable="yes">Autosave</property>
|
<property name="label" translatable="yes">Autosave</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">0</property>
|
<property name="left-attach">0</property>
|
||||||
<property name="top_attach">1</property>
|
<property name="top-attach">1</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkSwitch" id="SwitchAutosave">
|
<object class="GtkSwitch" id="SwitchAutosave">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can-focus">True</property>
|
||||||
<property name="halign">end</property>
|
<property name="halign">end</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">1</property>
|
<property name="left-attach">1</property>
|
||||||
<property name="top_attach">1</property>
|
<property name="top-attach">1</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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="hexpand">True</property>
|
<property name="hexpand">True</property>
|
||||||
<property name="label" translatable="yes">Show favourites at top of list</property>
|
<property name="label" translatable="yes">Show favourites at top of list</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">0</property>
|
<property name="left-attach">0</property>
|
||||||
<property name="top_attach">2</property>
|
<property name="top-attach">2</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkSwitch" id="SwitchShowFavouritesAtTopOfList">
|
<object class="GtkSwitch" id="SwitchShowFavouritesAtTopOfList">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can-focus">True</property>
|
||||||
<property name="halign">end</property>
|
<property name="halign">end</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">1</property>
|
<property name="left-attach">1</property>
|
||||||
<property name="top_attach">2</property>
|
<property name="top-attach">2</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
|
<child>
|
||||||
|
<placeholder/>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<placeholder/>
|
||||||
|
</child>
|
||||||
|
<child>
|
||||||
|
<placeholder/>
|
||||||
|
</child>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
<child type="tab">
|
<child type="tab">
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can-focus">False</property>
|
||||||
<property name="label" translatable="yes">General</property>
|
<property name="label" translatable="yes">General</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="tab_fill">False</property>
|
<property name="tab-fill">False</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
|
<!-- n-columns=3 n-rows=4 -->
|
||||||
<object class="GtkGrid">
|
<object class="GtkGrid">
|
||||||
<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">5</property>
|
<property name="margin-left">5</property>
|
||||||
<property name="margin_right">5</property>
|
<property name="margin-right">5</property>
|
||||||
<property name="margin_top">5</property>
|
<property name="margin-top">5</property>
|
||||||
<property name="margin_bottom">20</property>
|
<property name="margin-bottom">20</property>
|
||||||
<property name="column_spacing">3</property>
|
<property name="column-spacing">3</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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="hexpand">True</property>
|
<property name="hexpand">True</property>
|
||||||
<property name="label" translatable="yes">Default</property>
|
<property name="label" translatable="yes">Default</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">0</property>
|
<property name="left-attach">0</property>
|
||||||
<property name="top_attach">0</property>
|
<property name="top-attach">0</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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">Items ending soon</property>
|
<property name="label" translatable="yes">Items ending soon</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">0</property>
|
<property name="left-attach">0</property>
|
||||||
<property name="top_attach">1</property>
|
<property name="top-attach">1</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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">Favourite items</property>
|
<property name="label" translatable="yes">Favourite items</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">0</property>
|
<property name="left-attach">0</property>
|
||||||
<property name="top_attach">2</property>
|
<property name="top-attach">2</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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">Favourite items ending soon</property>
|
<property name="label" translatable="yes">Favourite items ending soon</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">0</property>
|
<property name="left-attach">0</property>
|
||||||
<property name="top_attach">3</property>
|
<property name="top-attach">3</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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">end</property>
|
<property name="halign">end</property>
|
||||||
<property name="label" translatable="yes">seconds</property>
|
<property name="label" translatable="yes">seconds</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">2</property>
|
<property name="left-attach">2</property>
|
||||||
<property name="top_attach">0</property>
|
<property name="top-attach">0</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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">end</property>
|
<property name="halign">end</property>
|
||||||
<property name="label" translatable="yes">seconds</property>
|
<property name="label" translatable="yes">seconds</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">2</property>
|
<property name="left-attach">2</property>
|
||||||
<property name="top_attach">1</property>
|
<property name="top-attach">1</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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">end</property>
|
<property name="halign">end</property>
|
||||||
<property name="label" translatable="yes">seconds</property>
|
<property name="label" translatable="yes">seconds</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">2</property>
|
<property name="left-attach">2</property>
|
||||||
<property name="top_attach">2</property>
|
<property name="top-attach">2</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<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">end</property>
|
<property name="halign">end</property>
|
||||||
<property name="label" translatable="yes">seconds</property>
|
<property name="label" translatable="yes">seconds</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">2</property>
|
<property name="left-attach">2</property>
|
||||||
<property name="top_attach">3</property>
|
<property name="top-attach">3</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkEntry" id="EntryUpdateInterval">
|
<object class="GtkEntry" id="EntryUpdateInterval">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can-focus">True</property>
|
||||||
<property name="margin_left">5</property>
|
<property name="margin-left">5</property>
|
||||||
<property name="margin_right">5</property>
|
<property name="margin-right">5</property>
|
||||||
<property name="margin_top">2</property>
|
<property name="margin-top">2</property>
|
||||||
<property name="margin_bottom">2</property>
|
<property name="margin-bottom">2</property>
|
||||||
<property name="max_length">3</property>
|
<property name="max-length">3</property>
|
||||||
<property name="width_chars">5</property>
|
<property name="width-chars">5</property>
|
||||||
<property name="input_purpose">number</property>
|
<property name="input-purpose">number</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">1</property>
|
<property name="left-attach">1</property>
|
||||||
<property name="top_attach">0</property>
|
<property name="top-attach">0</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkEntry" id="EntryUpdateIntervalCritical">
|
<object class="GtkEntry" id="EntryUpdateIntervalCritical">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can-focus">True</property>
|
||||||
<property name="margin_left">5</property>
|
<property name="margin-left">5</property>
|
||||||
<property name="margin_right">5</property>
|
<property name="margin-right">5</property>
|
||||||
<property name="margin_top">2</property>
|
<property name="margin-top">2</property>
|
||||||
<property name="margin_bottom">2</property>
|
<property name="margin-bottom">2</property>
|
||||||
<property name="max_length">3</property>
|
<property name="max-length">3</property>
|
||||||
<property name="width_chars">5</property>
|
<property name="width-chars">5</property>
|
||||||
<property name="input_purpose">number</property>
|
<property name="input-purpose">number</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">1</property>
|
<property name="left-attach">1</property>
|
||||||
<property name="top_attach">1</property>
|
<property name="top-attach">1</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkEntry" id="EntryFavouriteUpdateInterval">
|
<object class="GtkEntry" id="EntryFavouriteUpdateInterval">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can-focus">True</property>
|
||||||
<property name="margin_left">5</property>
|
<property name="margin-left">5</property>
|
||||||
<property name="margin_right">5</property>
|
<property name="margin-right">5</property>
|
||||||
<property name="margin_top">2</property>
|
<property name="margin-top">2</property>
|
||||||
<property name="margin_bottom">2</property>
|
<property name="margin-bottom">2</property>
|
||||||
<property name="max_length">3</property>
|
<property name="max-length">3</property>
|
||||||
<property name="width_chars">5</property>
|
<property name="width-chars">5</property>
|
||||||
<property name="input_purpose">number</property>
|
<property name="input-purpose">number</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">1</property>
|
<property name="left-attach">1</property>
|
||||||
<property name="top_attach">2</property>
|
<property name="top-attach">2</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkEntry" id="EntryFavouriteUpdateIntervalCritical">
|
<object class="GtkEntry" id="EntryFavouriteUpdateIntervalCritical">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can-focus">True</property>
|
||||||
<property name="margin_left">5</property>
|
<property name="margin-left">5</property>
|
||||||
<property name="margin_right">5</property>
|
<property name="margin-right">5</property>
|
||||||
<property name="margin_top">2</property>
|
<property name="margin-top">2</property>
|
||||||
<property name="margin_bottom">2</property>
|
<property name="margin-bottom">2</property>
|
||||||
<property name="max_length">3</property>
|
<property name="max-length">3</property>
|
||||||
<property name="width_chars">5</property>
|
<property name="width-chars">5</property>
|
||||||
<property name="input_purpose">number</property>
|
<property name="input-purpose">number</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="left_attach">1</property>
|
<property name="left-attach">1</property>
|
||||||
<property name="top_attach">3</property>
|
<property name="top-attach">3</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
@ -299,12 +307,12 @@
|
||||||
<child type="tab">
|
<child type="tab">
|
||||||
<object class="GtkLabel">
|
<object class="GtkLabel">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can-focus">False</property>
|
||||||
<property name="label" translatable="yes">Update intervals</property>
|
<property name="label" translatable="yes">Update intervals</property>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="position">1</property>
|
<property name="position">1</property>
|
||||||
<property name="tab_fill">False</property>
|
<property name="tab-fill">False</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
@ -317,14 +325,15 @@
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkBox">
|
<object class="GtkBox">
|
||||||
<property name="visible">True</property>
|
<property name="visible">True</property>
|
||||||
<property name="can_focus">False</property>
|
<property name="can-focus">False</property>
|
||||||
<property name="spacing">5</property>
|
<property name="spacing">5</property>
|
||||||
<child>
|
<child>
|
||||||
<object class="GtkButton">
|
<object class="GtkButton">
|
||||||
<property name="label" translatable="yes">About Buypeeb</property>
|
<property name="label" translatable="yes">About Buypeeb</property>
|
||||||
<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>
|
||||||
|
<signal name="clicked" handler="ButtonAboutClicked" swapped="no"/>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
|
@ -336,14 +345,14 @@
|
||||||
<object class="GtkButton">
|
<object class="GtkButton">
|
||||||
<property name="label" translatable="yes">Save</property>
|
<property name="label" translatable="yes">Save</property>
|
||||||
<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>
|
||||||
<signal name="clicked" handler="ButtonSaveClicked" swapped="no"/>
|
<signal name="clicked" handler="ButtonSaveClicked" swapped="no"/>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
<property name="pack_type">end</property>
|
<property name="pack-type">end</property>
|
||||||
<property name="position">1</property>
|
<property name="position">1</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
|
@ -351,14 +360,14 @@
|
||||||
<object class="GtkButton">
|
<object class="GtkButton">
|
||||||
<property name="label" translatable="yes">Cancel</property>
|
<property name="label" translatable="yes">Cancel</property>
|
||||||
<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>
|
||||||
<signal name="clicked" handler="ButtonCancelClicked" swapped="no"/>
|
<signal name="clicked" handler="ButtonCancelClicked" swapped="no"/>
|
||||||
</object>
|
</object>
|
||||||
<packing>
|
<packing>
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
<property name="pack_type">end</property>
|
<property name="pack-type">end</property>
|
||||||
<property name="position">2</property>
|
<property name="position">2</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
|
@ -367,7 +376,7 @@
|
||||||
<property name="expand">False</property>
|
<property name="expand">False</property>
|
||||||
<property name="fill">True</property>
|
<property name="fill">True</property>
|
||||||
<property name="padding">2</property>
|
<property name="padding">2</property>
|
||||||
<property name="pack_type">end</property>
|
<property name="pack-type">end</property>
|
||||||
<property name="position">4</property>
|
<property name="position">4</property>
|
||||||
</packing>
|
</packing>
|
||||||
</child>
|
</child>
|
||||||
|
|
Loading…
Reference in a new issue