[gnome-mahjongg/arnaudb/wip/gtk4: 21/24] Use Gtk namespace.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-mahjongg/arnaudb/wip/gtk4: 21/24] Use Gtk namespace.
- Date: Sun, 3 May 2020 16:11:18 +0000 (UTC)
commit 666b9551c9577f45245f9c81f91550a9292b7a18
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Tue Apr 7 08:36:11 2020 +0200
Use Gtk namespace.
src/gnome-mahjongg.vala | 191 ++++++++++++++++++++++++------------------------
src/score-dialog.vala | 44 +++++------
2 files changed, 118 insertions(+), 117 deletions(-)
---
diff --git a/src/gnome-mahjongg.vala b/src/gnome-mahjongg.vala
index 0c1e5ff..7e4dc73 100644
--- a/src/gnome-mahjongg.vala
+++ b/src/gnome-mahjongg.vala
@@ -8,26 +8,28 @@
* license.
*/
+using Gtk;
+
public class Mahjongg : Gtk.Application
{
- private Settings settings;
+ private GLib.Settings settings;
private History history;
private List<Map> maps = null;
- private Gtk.ApplicationWindow window;
- private Gtk.Label title;
+ private ApplicationWindow window;
+ private Label title;
private int window_width;
private int window_height;
private bool is_maximized;
private bool is_tiled;
private GameView game_view;
- private Gtk.Button pause_button;
- private Gtk.Label moves_label;
- private Gtk.Label clock_label;
- private Gtk.Dialog? preferences_dialog = null;
+ private Button pause_button;
+ private Label moves_label;
+ private Label clock_label;
+ private Dialog? preferences_dialog = null;
private const OptionEntry[] option_entries =
{
@@ -70,75 +72,75 @@ public class Mahjongg : Gtk.Application
set_accels_for_action ("app.help", {"F1"});
set_accels_for_action ("app.quit", {"<Primary>q", "<Primary>w"});
- settings = new Settings ("org.gnome.Mahjongg");
+ settings = new GLib.Settings ("org.gnome.Mahjongg");
load_maps ();
history = new History (Path.build_filename (Environment.get_user_data_dir (), "gnome-mahjongg",
"history"));
history.load ();
- window = new Gtk.ApplicationWindow (this);
+ window = new ApplicationWindow (this);
window.size_allocate.connect (size_allocate_cb);
window.map.connect (init_state_watcher);
window.set_default_size (settings.get_int ("window-width"), settings.get_int ("window-height"));
if (settings.get_boolean ("window-is-maximized"))
window.maximize ();
- var status_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 10);
+ var status_box = new Box (Orientation.HORIZONTAL, 10);
- var group_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
- var label = new Gtk.Label (_("Moves Left:"));
+ var group_box = new Box (Orientation.HORIZONTAL, 0);
+ var label = new Label (_("Moves Left:"));
group_box.add (label);
- var spacer = new Gtk.Label (" ");
+ var spacer = new Label (" ");
group_box.add (spacer);
- moves_label = new Gtk.Label ("");
+ moves_label = new Label ("");
group_box.add (moves_label);
status_box.add (group_box);
- clock_label = new Gtk.Label ("");
+ clock_label = new Label ("");
status_box.add (clock_label);
- var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+ var vbox = new Box (Orientation.VERTICAL, 0);
game_view = new GameView ();
- view_click_controller = new Gtk.GestureClick ();
+ view_click_controller = new GestureClick ();
view_click_controller.pressed.connect (on_click);
game_view.add_controller (view_click_controller);
game_view.set_size_request (600, 400);
game_view.hexpand = true;
game_view.vexpand = true;
- title = new Gtk.Label ("");
+ title = new Label ("");
title.get_style_context ().add_class ("title");
- var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+ var hbox = new Box (Orientation.HORIZONTAL, 0);
hbox.get_style_context ().add_class ("linked");
- var undo_button = new Gtk.Button.from_icon_name ("edit-undo-symbolic");
- undo_button.valign = Gtk.Align.CENTER;
+ var undo_button = new Button.from_icon_name ("edit-undo-symbolic");
+ undo_button.valign = Align.CENTER;
undo_button.action_name = "app.undo";
undo_button.set_tooltip_text (_("Undo your last move"));
hbox.add (undo_button);
- var redo_button = new Gtk.Button.from_icon_name ("edit-redo-symbolic");
- redo_button.valign = Gtk.Align.CENTER;
+ var redo_button = new Button.from_icon_name ("edit-redo-symbolic");
+ redo_button.valign = Align.CENTER;
redo_button.action_name = "app.redo";
redo_button.set_tooltip_text (_("Redo your last move"));
hbox.add (redo_button);
- var hint_button = new Gtk.Button.from_icon_name ("dialog-question-symbolic");
- hint_button.valign = Gtk.Align.CENTER;
+ var hint_button = new Button.from_icon_name ("dialog-question-symbolic");
+ hint_button.valign = Align.CENTER;
hint_button.action_name = "app.hint";
hint_button.set_tooltip_text (_("Receive a hint for your next move"));
- pause_button = new Gtk.Button.from_icon_name ("media-playback-pause-symbolic");
- pause_button.valign = Gtk.Align.CENTER;
+ pause_button = new Button.from_icon_name ("media-playback-pause-symbolic");
+ pause_button.valign = Align.CENTER;
pause_button.action_name = "app.pause";
pause_button.set_tooltip_text (_("Pause the game"));
- var title_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 2);
+ var title_box = new Box (Orientation.VERTICAL, 2);
title_box.add (title);
- status_box.halign = Gtk.Align.CENTER;
+ status_box.halign = Align.CENTER;
title_box.add (status_box);
var menu = new Menu ();
@@ -154,12 +156,12 @@ public class Mahjongg : Gtk.Application
help_menu.append (_("_Help"), "app.help");
help_menu.append (_("_About Mahjongg"), "app.about");
- var menu_button = new Gtk.MenuButton ();
- menu_button.valign = Gtk.Align.CENTER;
+ var menu_button = new MenuButton ();
+ menu_button.valign = Align.CENTER;
menu_button.set_menu_model (menu);
menu_button.set_icon_name ("open-menu-symbolic");
- var header_bar = new Gtk.HeaderBar ();
+ var header_bar = new HeaderBar ();
header_bar.set_custom_title (title_box);
header_bar.set_show_title_buttons (true);
header_bar.pack_start (hbox);
@@ -178,8 +180,8 @@ public class Mahjongg : Gtk.Application
game_view.grab_focus ();
- conf_value_changed_cb (settings, "tileset");
- conf_value_changed_cb (settings, "bgcolour");
+ conf_value_changed_cb ("tileset");
+ conf_value_changed_cb ("bgcolour");
tick_cb ();
}
@@ -268,16 +270,16 @@ public class Mahjongg : Gtk.Application
moves_label.set_text ("%2u".printf (game_view.game.moves_left));
}
- private void theme_changed_cb (Gtk.ComboBox widget)
+ private void theme_changed_cb (ComboBox widget)
{
- Gtk.TreeIter iter;
+ TreeIter iter;
widget.get_active_iter (out iter);
string theme;
widget.model.get (iter, 1, out theme);
settings.set_string ("tileset", theme);
}
- private void conf_value_changed_cb (Settings settings, string key)
+ private void conf_value_changed_cb (string key)
{
if (key == "tileset")
{
@@ -293,18 +295,17 @@ public class Mahjongg : Gtk.Application
/* Prompt user if already made a move */
if (game_view.game.started)
{
- var dialog = new Gtk.MessageDialog (window,
- Gtk.DialogFlags.MODAL,
- Gtk.MessageType.QUESTION,
- Gtk.ButtonsType.NONE,
- "%s", _("Do you want to start a new game with this
map?"));
+ var dialog = new MessageDialog (window,
+ DialogFlags.MODAL,
+ MessageType.QUESTION,
+ ButtonsType.NONE,
+ "%s", _("Do you want to start a new game with this map?"));
dialog.format_secondary_text (_("If you continue playing the next game will use the new
map."));
- dialog.add_buttons (_("_Continue playing"), Gtk.ResponseType.REJECT,
- _("Use _new map"), Gtk.ResponseType.ACCEPT,
- null);
- dialog.set_default_response (Gtk.ResponseType.ACCEPT);
+ dialog.add_buttons (_("_Continue playing"), ResponseType.REJECT,
+ _("Use _new map"), ResponseType.ACCEPT);
+ dialog.set_default_response (ResponseType.ACCEPT);
var response = dialog.run ();
- if (response == Gtk.ResponseType.ACCEPT)
+ if (response == ResponseType.ACCEPT)
new_game ();
dialog.destroy ();
}
@@ -313,21 +314,21 @@ public class Mahjongg : Gtk.Application
}
}
- private Gtk.GestureClick view_click_controller; // for keeping in memory
- private inline void on_click (Gtk.GestureClick _view_click_controller, int n_press, double event_x,
double event_y)
+ private GestureClick view_click_controller; // for keeping in memory
+ private inline void on_click (GestureClick _view_click_controller, int n_press, double event_x, double
event_y)
{
/* Cancel pause on click */
if (game_view.game.paused)
pause_cb ();
}
- private void background_changed_cb (Gtk.ColorButton widget)
+ private void background_changed_cb (ColorButton widget)
{
var colour = widget.get_rgba ();
settings.set_string ("bgcolour", "#%04x%04x%04x".printf ((int) (colour.red * 65536 + 0.5), (int)
(colour.green * 65536 + 0.5), (int) (colour.blue * 65536 + 0.5)));
}
- private void map_changed_cb (Gtk.ComboBox widget)
+ private void map_changed_cb (ComboBox widget)
{
settings.set_string ("mapset", maps.nth_data (widget.active).name);
}
@@ -352,7 +353,7 @@ public class Mahjongg : Gtk.Application
history.add (entry);
history.save ();
- if (show_scores (entry, true) == Gtk.ResponseType.CLOSE)
+ if (show_scores (entry, true) == ResponseType.CLOSE)
window.destroy ();
else
new_game ();
@@ -361,10 +362,11 @@ public class Mahjongg : Gtk.Application
{
bool allow_shuffle = game_view.game.number_of_movable_tiles () > 1;
- var dialog = new Gtk.MessageDialog (window, Gtk.DialogFlags.MODAL |
Gtk.DialogFlags.DESTROY_WITH_PARENT,
- Gtk.MessageType.INFO,
- Gtk.ButtonsType.NONE,
- "%s", _("There are no more moves."));
+ var dialog = new MessageDialog (window,
+ DialogFlags.MODAL | DialogFlags.DESTROY_WITH_PARENT,
+ MessageType.INFO,
+ ButtonsType.NONE,
+ "%s", _("There are no more moves."));
dialog.format_secondary_text ("%s%s%s".printf (_("Each puzzle has at least one solution. You
can undo your moves and try and find the solution, restart this game, or start a new one."),
allow_shuffle ? " " : "",
allow_shuffle ? _("You can also try to reshuffle
the game, but this does not guarantee a solution.") : ""));
@@ -392,7 +394,7 @@ public class Mahjongg : Gtk.Application
case NoMovesDialogResponse.NEW_GAME:
new_game ();
break;
- case Gtk.ResponseType.DELETE_EVENT:
+ case ResponseType.DELETE_EVENT:
break;
default:
assert_not_reached ();
@@ -423,33 +425,32 @@ public class Mahjongg : Gtk.Application
bool dialogs_use_header;
Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out dialogs_use_header);
- preferences_dialog = new Gtk.Dialog.with_buttons (_("Preferences"),
- window,
- dialogs_use_header ?
Gtk.DialogFlags.USE_HEADER_BAR : 0,
- null);
- var dialog_content_area = (Gtk.Box) preferences_dialog.get_content_area ();
+ preferences_dialog = new Dialog.with_buttons (_("Preferences"),
+ window,
+ dialogs_use_header ? DialogFlags.USE_HEADER_BAR : 0);
+ var dialog_content_area = (Box) preferences_dialog.get_content_area ();
dialog_content_area.set_spacing (2);
preferences_dialog.set_resizable (false);
- preferences_dialog.set_default_response (Gtk.ResponseType.CLOSE);
+ preferences_dialog.set_default_response (ResponseType.CLOSE);
preferences_dialog.response.connect (preferences_dialog_response_cb);
dialog_content_area.margin_top = 10;
dialog_content_area.margin_start = 10;
dialog_content_area.margin_end = 10;
dialog_content_area.margin_bottom = 10;
- var grid = new Gtk.Grid ();
+ var grid = new Grid ();
grid.set_row_spacing (6);
grid.set_column_spacing (18);
- var label = new Gtk.Label.with_mnemonic (_("_Theme:"));
- label.halign = Gtk.Align.START;
+ var label = new Label.with_mnemonic (_("_Theme:"));
+ label.halign = Align.START;
grid.attach (label, 0, 0, 1, 1);
var themes = load_themes ();
- var theme_combo = new Gtk.ComboBox ();
+ var theme_combo = new ComboBox ();
var theme_store = new Gtk.ListStore (2, typeof (string), typeof (string));
theme_combo.model = theme_store;
- var renderer = new Gtk.CellRendererText ();
+ var renderer = new CellRendererText ();
theme_combo.pack_start (renderer, true);
theme_combo.add_attribute (renderer, "text", 0);
foreach (var theme in themes)
@@ -457,7 +458,7 @@ public class Mahjongg : Gtk.Application
var tokens = theme.split (".", -1);
var name = tokens[0];
- Gtk.TreeIter iter;
+ TreeIter iter;
theme_store.append (out iter);
theme_store.set (iter, 0, name, 1, theme, -1);
@@ -469,21 +470,21 @@ public class Mahjongg : Gtk.Application
grid.attach (theme_combo, 1, 0, 1, 1);
label.set_mnemonic_widget (theme_combo);
- label = new Gtk.Label.with_mnemonic (_("_Layout:"));
- label.halign = Gtk.Align.START;
+ label = new Label.with_mnemonic (_("_Layout:"));
+ label.halign = Align.START;
grid.attach (label, 0, 1, 1, 1);
- var map_combo = new Gtk.ComboBox ();
+ var map_combo = new ComboBox ();
var map_store = new Gtk.ListStore (2, typeof (string), typeof (string));
map_combo.model = map_store;
- renderer = new Gtk.CellRendererText ();
+ renderer = new CellRendererText ();
map_combo.pack_start (renderer, true);
map_combo.add_attribute (renderer, "text", 0);
foreach (var map in maps)
{
var display_name = dpgettext2 (null, "mahjongg map name", map.name);
- Gtk.TreeIter iter;
+ TreeIter iter;
map_store.append (out iter);
map_store.set (iter, 0, display_name, 1, map, -1);
@@ -495,11 +496,11 @@ public class Mahjongg : Gtk.Application
grid.attach (map_combo, 1, 1, 1, 1);
label.set_mnemonic_widget (map_combo);
- label = new Gtk.Label.with_mnemonic (_("_Background color:"));
- label.halign = Gtk.Align.START;
+ label = new Label.with_mnemonic (_("_Background color:"));
+ label.halign = Align.START;
grid.attach (label, 0, 2, 1, 1);
- var widget = new Gtk.ColorButton ();
+ var widget = new ColorButton ();
widget.set_rgba (game_view.background_color);
widget.color_set.connect (background_changed_cb);
widget.set_hexpand (true);
@@ -509,12 +510,12 @@ public class Mahjongg : Gtk.Application
dialog_content_area.add (grid);
if (!dialogs_use_header)
- preferences_dialog.add_button (_("_Close"), Gtk.ResponseType.CLOSE);
+ preferences_dialog.add_button (_("_Close"), ResponseType.CLOSE);
preferences_dialog.present ();
}
- private void preferences_dialog_response_cb (Gtk.Dialog dialog, int response)
+ private void preferences_dialog_response_cb (Dialog dialog, int response)
{
preferences_dialog.destroy ();
preferences_dialog = null;
@@ -609,20 +610,18 @@ public class Mahjongg : Gtk.Application
null
};
- Gtk.show_about_dialog (window,
- "program-name", _("Mahjongg"),
- "version", VERSION,
- "comments",
- _("A matching game played with Mahjongg tiles"),
- "copyright", "Copyright © 1998–2008 Free Software Foundation, Inc.",
- "license-type", Gtk.License.GPL_2_0,
- "authors", authors,
- "artists", artists,
- "documenters", documenters,
- "translator-credits", _("translator-credits"),
- "logo-icon-name", "org.gnome.Mahjongg",
- "website", "https://wiki.gnome.org/Apps/Mahjongg";,
- null);
+ show_about_dialog (window,
+ "program-name", _("Mahjongg"),
+ "version", VERSION,
+ "comments", _("A matching game played with Mahjongg tiles"),
+ "copyright", "Copyright © 1998–2008 Free Software Foundation, Inc.",
+ "license-type", License.GPL_2_0,
+ "authors", authors,
+ "artists", artists,
+ "documenters", documenters,
+ "translator-credits", _("translator-credits"),
+ "logo-icon-name", " org.gnome.Mahjongg",
+ "website", "https://wiki.gnome.org/Apps/Mahjongg";);
}
private void pause_cb ()
@@ -737,7 +736,7 @@ public class Mahjongg : Gtk.Application
{
try
{
- Gtk.show_uri_on_window (window, "help:gnome-mahjongg", Gtk.get_current_event_time ());
+ show_uri_on_window (window, "help:gnome-mahjongg", get_current_event_time ());
}
catch (Error e)
{
@@ -794,12 +793,12 @@ public class Mahjongg : Gtk.Application
Intl.textdomain (GETTEXT_PACKAGE);
Environment.set_application_name (_("Mahjongg"));
- Gtk.Window.set_default_icon_name ("org.gnome.Mahjongg");
+ Window.set_default_icon_name ("org.gnome.Mahjongg");
var app = new Mahjongg ();
var result = app.run (args);
- Settings.sync ();
+ GLib.Settings.sync ();
return result;
}
diff --git a/src/score-dialog.vala b/src/score-dialog.vala
index d7852f4..54346c0 100644
--- a/src/score-dialog.vala
+++ b/src/score-dialog.vala
@@ -8,14 +8,16 @@
* license.
*/
-public class ScoreDialog : Gtk.Dialog
+using Gtk;
+
+public class ScoreDialog : Dialog
{
private History history;
private HistoryEntry? selected_entry = null;
private Gtk.ListStore size_model;
private Gtk.ListStore score_model;
- private Gtk.ComboBox size_combo;
- private Gtk.TreeView scores;
+ private ComboBox size_combo;
+ private TreeView scores;
public ScoreDialog (History history, HistoryEntry? selected_entry = null, bool show_quit = false)
{
@@ -25,49 +27,49 @@ public class ScoreDialog : Gtk.Dialog
if (show_quit)
{
- add_button (_("_Quit"), Gtk.ResponseType.CLOSE);
- add_button (_("New Game"), Gtk.ResponseType.OK);
+ add_button (_("_Quit"), ResponseType.CLOSE);
+ add_button (_("New Game"), ResponseType.OK);
}
else
- add_button (_("OK"), Gtk.ResponseType.DELETE_EVENT);
+ add_button (_("OK"), ResponseType.DELETE_EVENT);
set_size_request (200, 300);
- var vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 5);
+ var vbox = new Box (Orientation.VERTICAL, 5);
vbox.margin_top = 6;
vbox.margin_start = 6;
vbox.margin_end = 6;
vbox.margin_bottom = 6;
get_content_area ().add (vbox);
- var hbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
+ var hbox = new Box (Orientation.HORIZONTAL, 6);
vbox.add (hbox);
- var label = new Gtk.Label (_("Layout:"));
+ var label = new Label (_("Layout:"));
hbox.add (label);
size_model = new Gtk.ListStore (2, typeof (string), typeof (string));
- size_combo = new Gtk.ComboBox ();
+ size_combo = new ComboBox ();
size_combo.changed.connect (size_changed_cb);
size_combo.model = size_model;
- var renderer = new Gtk.CellRendererText ();
+ var renderer = new CellRendererText ();
size_combo.pack_start (renderer, true);
size_combo.add_attribute (renderer, "text", 0);
hbox.add (size_combo);
- var scroll = new Gtk.ScrolledWindow (null, null);
- scroll.shadow_type = Gtk.ShadowType.ETCHED_IN;
- scroll.set_policy (Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
+ var scroll = new ScrolledWindow (null, null);
+ scroll.shadow_type = ShadowType.ETCHED_IN;
+ scroll.set_policy (PolicyType.NEVER, PolicyType.AUTOMATIC);
scroll.hexpand = true;
scroll.vexpand = true;
vbox.add (scroll);
score_model = new Gtk.ListStore (3, typeof (string), typeof (string), typeof (int));
- scores = new Gtk.TreeView ();
- renderer = new Gtk.CellRendererText ();
+ scores = new TreeView ();
+ renderer = new CellRendererText ();
scores.insert_column_with_attributes (-1, _("Date"), renderer, "text", 0, "weight", 2);
- renderer = new Gtk.CellRendererText ();
+ renderer = new CellRendererText ();
renderer.xalign = 1.0f;
scores.insert_column_with_attributes (-1, _("Time"), renderer, "text", 1, "weight", 2);
scores.model = score_model;
@@ -99,7 +101,7 @@ public class ScoreDialog : Gtk.Dialog
if (entry == selected_entry)
weight = Pango.Weight.BOLD;
- Gtk.TreeIter iter;
+ TreeIter iter;
score_model.append (out iter);
score_model.set (iter, 0, date_label, 1, time_label, 2, weight);
@@ -129,9 +131,9 @@ public class ScoreDialog : Gtk.Dialog
return a.date.compare (b.date);
}
- private void size_changed_cb (Gtk.ComboBox combo)
+ private void size_changed_cb (ComboBox combo)
{
- Gtk.TreeIter iter;
+ TreeIter iter;
if (!combo.get_active_iter (out iter))
return;
@@ -143,7 +145,7 @@ public class ScoreDialog : Gtk.Dialog
private void entry_added_cb (HistoryEntry entry)
{
/* Ignore if already have an entry for this */
- Gtk.TreeIter iter;
+ TreeIter iter;
var have_size_entry = false;
if (size_model.get_iter_first (out iter))
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
