From 162b908c7bb930d300a91d43c406c678ec6b7c97 Mon Sep 17 00:00:00 2001 From: Mohamed Boussaffa Date: Sun, 19 Feb 2017 12:49:03 +0800 Subject: [PATCH] made compatible with gtk3.10 --- src/MainWindow.cpp | 17 +- src/gresources.c | 421 ++++++++++++++++++++++++--------------------- src/main.cpp | 4 +- ui/headerbar.ui | 3 +- ui/window.glade | 10 +- 5 files changed, 246 insertions(+), 209 deletions(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 6129bc1..9e39a60 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -137,9 +137,20 @@ void MainWindow::run(Glib::RefPtr app) { Glib::RefPtr builder = Gtk::Builder::create(); - builder->add_from_resource("/nethogs_gui/window.glade"); - builder->add_from_resource("/nethogs_gui/headerbar.ui"); - + try{ + builder->add_from_resource("/nethogs_gui/window.glade"); + } + catch(Gtk::BuilderError const& e){ + std::cout << e.what() << std::endl; + return; + } + try{ + builder->add_from_resource("/nethogs_gui/headerbar.ui"); + } + catch(Gtk::BuilderError const& e){ + std::cout << e.what() << std::endl; + return; + } //get widgets m_window = loadWiget(builder, "main_window"); diff --git a/src/gresources.c b/src/gresources.c index 0e3eb98..84c6b4e 100644 --- a/src/gresources.c +++ b/src/gresources.c @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[5041]; const double alignment; void * const ptr;} app_resource_data = { { +static const SECTION union { const guint8 data[5244]; const double alignment; void * const ptr;} app_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, @@ -28,7 +28,7 @@ static const SECTION union { const guint8 data[5041]; const double alignment; vo 0x10, 0x06, 0x00, 0x00, 0x22, 0xd1, 0x1d, 0x0b, 0x03, 0x00, 0x00, 0x00, 0x10, 0x06, 0x00, 0x00, 0x0c, 0x00, 0x76, 0x00, 0x20, 0x06, 0x00, 0x00, - 0xb1, 0x13, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, + 0x7c, 0x14, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x61, 0x70, 0x70, 0x6d, 0x65, 0x6e, 0x75, 0x2e, 0x75, 0x69, 0x00, 0x00, 0x9f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -96,14 +96,14 @@ static const SECTION union { const guint8 data[5041]; const double alignment; vo 0x21, 0x2d, 0x2d, 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x67, 0x6c, 0x61, 0x64, 0x65, - 0x20, 0x33, 0x2e, 0x31, 0x38, 0x2e, 0x33, 0x20, + 0x20, 0x33, 0x2e, 0x31, 0x36, 0x2e, 0x31, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x3c, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, 0x20, 0x6c, 0x69, 0x62, 0x3d, 0x22, 0x67, 0x74, 0x6b, 0x2b, 0x22, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x33, 0x2e, 0x31, - 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x42, 0x61, 0x72, 0x22, @@ -203,7 +203,7 @@ static const SECTION union { const guint8 data[5041]; const double alignment; vo 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x2e, 0x67, 0x6c, 0x61, 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, - 0x81, 0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x4c, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, 0x2e, 0x30, 0x22, 0x20, 0x65, 0x6e, 0x63, 0x6f, @@ -212,14 +212,14 @@ static const SECTION union { const guint8 data[5041]; const double alignment; vo 0x21, 0x2d, 0x2d, 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20, 0x67, 0x6c, 0x61, 0x64, 0x65, - 0x20, 0x33, 0x2e, 0x31, 0x38, 0x2e, 0x33, 0x20, + 0x20, 0x33, 0x2e, 0x31, 0x36, 0x2e, 0x31, 0x20, 0x2d, 0x2d, 0x3e, 0x0a, 0x3c, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x3c, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x73, 0x20, 0x6c, 0x69, 0x62, 0x3d, 0x22, 0x67, 0x74, 0x6b, 0x2b, 0x22, 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x33, 0x2e, 0x31, - 0x34, 0x22, 0x2f, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, + 0x30, 0x22, 0x2f, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, @@ -281,15 +281,12 @@ static const SECTION union { const guint8 data[5041]; const double alignment; vo 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, - 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x72, 0x65, - 0x65, 0x56, 0x69, 0x65, 0x77, 0x22, 0x20, 0x69, - 0x64, 0x3d, 0x22, 0x74, 0x72, 0x65, 0x65, 0x76, - 0x69, 0x65, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, 0x61, 0x6d, - 0x65, 0x22, 0x3e, 0x4c, 0x69, 0x73, 0x74, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x63, 0x72, + 0x6f, 0x6c, 0x6c, 0x65, 0x64, 0x57, 0x69, 0x6e, + 0x64, 0x6f, 0x77, 0x22, 0x20, 0x69, 0x64, 0x3d, + 0x22, 0x73, 0x63, 0x72, 0x6f, 0x6c, 0x6c, 0x65, + 0x64, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x31, + 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, @@ -301,150 +298,134 @@ static const SECTION union { const guint8 data[5041]; const double alignment; vo 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x6e, 0x61, 0x62, - 0x6c, 0x65, 0x5f, 0x67, 0x72, 0x69, 0x64, 0x5f, - 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x22, 0x3e, 0x76, - 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, - 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3d, - 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, 0x72, - 0x65, 0x65, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x74, 0x72, 0x65, 0x65, 0x76, 0x69, 0x65, - 0x77, 0x2d, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x31, 0x22, 0x2f, 0x3e, 0x3c, - 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, - 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, - 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, - 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, - 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, - 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, - 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, - 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x70, - 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x31, 0x22, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x73, 0x68, 0x61, 0x64, + 0x6f, 0x77, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x22, + 0x3e, 0x69, 0x6e, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x54, + 0x72, 0x65, 0x65, 0x56, 0x69, 0x65, 0x77, 0x22, + 0x20, 0x69, 0x64, 0x3d, 0x22, 0x74, 0x72, 0x65, + 0x65, 0x76, 0x69, 0x65, 0x77, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, - 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x3e, 0x4c, 0x69, 0x73, + 0x74, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, - 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x70, 0x22, 0x3e, - 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, - 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, - 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, - 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, - 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, - 0x22, 0x47, 0x74, 0x6b, 0x42, 0x6f, 0x78, 0x22, - 0x20, 0x69, 0x64, 0x3d, 0x22, 0x62, 0x6f, 0x78, - 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, - 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x6e, + 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x67, 0x72, 0x69, + 0x64, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x22, + 0x3e, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x61, + 0x6c, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x20, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2d, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3d, 0x22, 0x73, 0x65, 0x6c, 0x65, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x3c, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, + 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, + 0x54, 0x72, 0x65, 0x65, 0x53, 0x65, 0x6c, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x20, 0x69, + 0x64, 0x3d, 0x22, 0x74, 0x72, 0x65, 0x65, 0x76, + 0x69, 0x65, 0x77, 0x2d, 0x73, 0x65, 0x6c, 0x65, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x31, 0x22, 0x2f, + 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, + 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, + 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, + 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, - 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, - 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, - 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, - 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, - 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, - 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, - 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, - 0x3d, 0x22, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, - 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x5f, 0x31, - 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, - 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, - 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x61, 0x6c, - 0x69, 0x67, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, - 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, - 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x78, 0x70, 0x61, 0x64, 0x22, 0x3e, 0x32, - 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, + 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, + 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, + 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, + 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, + 0x6f, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, 0x6f, + 0x72, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, + 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, 0x5f, + 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x6d, + 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x74, 0x6f, + 0x70, 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, + 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, + 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, + 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x42, + 0x6f, 0x78, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, + 0x62, 0x6f, 0x78, 0x32, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, - 0x6c, 0x5f, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x6c, 0x5f, 0x31, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, @@ -478,7 +459,7 @@ static const SECTION union { const guint8 data[5041]; const double alignment; vo 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x31, 0x3c, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, @@ -488,7 +469,7 @@ static const SECTION union { const guint8 data[5041]; const double alignment; vo 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x6c, - 0x61, 0x62, 0x65, 0x6c, 0x5f, 0x33, 0x22, 0x3e, + 0x61, 0x62, 0x65, 0x6c, 0x5f, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, @@ -523,7 +504,7 @@ static const SECTION union { const guint8 data[5041]; const double alignment; vo 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, - 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, @@ -533,7 +514,7 @@ static const SECTION union { const guint8 data[5041]; const double alignment; vo 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x5f, - 0x34, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x33, 0x22, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, @@ -567,77 +548,121 @@ static const SECTION union { const guint8 data[5041]; const double alignment; vo 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, + 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, 0x6b, - 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, 0x61, - 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, - 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, - 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, 0x6c, - 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, + 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, + 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, + 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, + 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, + 0x22, 0x20, 0x69, 0x64, 0x3d, 0x22, 0x73, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x5f, 0x6c, 0x61, 0x62, + 0x65, 0x6c, 0x5f, 0x34, 0x22, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, + 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, + 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, + 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, + 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, + 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, - 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, - 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, - 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, 0x64, - 0x3e, 0x3c, 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, - 0x3c, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, - 0x63, 0x6c, 0x61, 0x73, 0x73, 0x3d, 0x22, 0x47, - 0x74, 0x6b, 0x53, 0x65, 0x70, 0x61, 0x72, 0x61, - 0x74, 0x6f, 0x72, 0x22, 0x20, 0x69, 0x64, 0x3d, - 0x22, 0x73, 0x65, 0x70, 0x61, 0x72, 0x61, 0x74, - 0x6f, 0x72, 0x32, 0x22, 0x3e, 0x3c, 0x70, 0x72, + 0x22, 0x78, 0x61, 0x6c, 0x69, 0x67, 0x6e, 0x22, + 0x3e, 0x30, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x76, 0x69, 0x73, - 0x69, 0x62, 0x6c, 0x65, 0x22, 0x3e, 0x54, 0x72, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x78, 0x70, 0x61, + 0x64, 0x22, 0x3e, 0x32, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, + 0x3c, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, + 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, + 0x22, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x63, 0x61, 0x6e, - 0x5f, 0x66, 0x6f, 0x63, 0x75, 0x73, 0x22, 0x3e, - 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x33, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, + 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, + 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, + 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, + 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, + 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, + 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, + 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, + 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x32, 0x3c, + 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, + 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x63, 0x68, 0x69, + 0x6c, 0x64, 0x3e, 0x3c, 0x6f, 0x62, 0x6a, 0x65, + 0x63, 0x74, 0x20, 0x63, 0x6c, 0x61, 0x73, 0x73, + 0x3d, 0x22, 0x47, 0x74, 0x6b, 0x53, 0x65, 0x70, + 0x61, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x22, 0x20, + 0x69, 0x64, 0x3d, 0x22, 0x73, 0x65, 0x70, 0x61, + 0x72, 0x61, 0x74, 0x6f, 0x72, 0x32, 0x22, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x22, + 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6d, 0x61, 0x72, 0x67, 0x69, 0x6e, 0x5f, 0x62, - 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x22, 0x3e, 0x31, + 0x63, 0x61, 0x6e, 0x5f, 0x66, 0x6f, 0x63, 0x75, + 0x73, 0x22, 0x3e, 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, - 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x70, 0x61, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x70, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x65, 0x78, 0x70, - 0x61, 0x6e, 0x64, 0x22, 0x3e, 0x46, 0x61, 0x6c, - 0x73, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, + 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, + 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, + 0x65, 0x3d, 0x22, 0x6d, 0x61, 0x72, 0x67, 0x69, + 0x6e, 0x5f, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, + 0x22, 0x3e, 0x31, 0x3c, 0x2f, 0x70, 0x72, 0x6f, + 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, 0x67, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x22, 0x3e, + 0x46, 0x61, 0x6c, 0x73, 0x65, 0x3c, 0x2f, 0x70, + 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, + 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, + 0x66, 0x69, 0x6c, 0x6c, 0x22, 0x3e, 0x54, 0x72, + 0x75, 0x65, 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, 0x6e, - 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x66, 0x69, 0x6c, - 0x6c, 0x22, 0x3e, 0x54, 0x72, 0x75, 0x65, 0x3c, - 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, - 0x79, 0x3e, 0x3c, 0x70, 0x72, 0x6f, 0x70, 0x65, - 0x72, 0x74, 0x79, 0x20, 0x6e, 0x61, 0x6d, 0x65, - 0x3d, 0x22, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0x3e, 0x33, 0x3c, 0x2f, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x3e, - 0x3c, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x69, 0x6e, - 0x67, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, 0x6c, - 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x63, 0x68, 0x69, - 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, - 0x0a, 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, - 0x29 + 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x70, 0x6f, 0x73, + 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x3e, 0x33, + 0x3c, 0x2f, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, + 0x74, 0x79, 0x3e, 0x3c, 0x2f, 0x70, 0x61, 0x63, + 0x6b, 0x69, 0x6e, 0x67, 0x3e, 0x3c, 0x2f, 0x63, + 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, 0x6f, + 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, 0x2f, + 0x63, 0x68, 0x69, 0x6c, 0x64, 0x3e, 0x3c, 0x2f, + 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x3e, 0x3c, + 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, + 0x63, 0x65, 0x3e, 0x0a, 0x00, 0x00, 0x28, 0x75, + 0x75, 0x61, 0x79, 0x29 } }; static GStaticResource static_resource = { app_resource_data.data, sizeof (app_resource_data.data), NULL, NULL, NULL }; diff --git a/src/main.cpp b/src/main.cpp index 2d542d2..eca2f41 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,7 +29,9 @@ static void onAppStartup(Glib::RefPtr & app) } int main(int argc, char* argv[]) -{ +{ + Gtk::Main kit(argc, argv); + setlocale (LC_ALL, ""); textdomain (PACKAGE); bindtextdomain (PACKAGE, PACKAGE_LOCALE_DIR); diff --git a/ui/headerbar.ui b/ui/headerbar.ui index 92d6aea..d890468 100644 --- a/ui/headerbar.ui +++ b/ui/headerbar.ui @@ -1,8 +1,7 @@ - + - True False diff --git a/ui/window.glade b/ui/window.glade index be16d0c..f01454a 100644 --- a/ui/window.glade +++ b/ui/window.glade @@ -1,5 +1,5 @@ - + @@ -57,8 +57,8 @@ True False - 2 0 + 2 True @@ -70,8 +70,8 @@ True False - 2 0 + 2 True @@ -83,8 +83,8 @@ True False - 2 0 + 2 True @@ -96,8 +96,8 @@ True False - 2 0 + 2 True