[gnome-chess/arnaudb/gesture-multi-press: 2/3] Use Gtk namespace.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-chess/arnaudb/gesture-multi-press: 2/3] Use Gtk namespace.
- Date: Mon, 6 Apr 2020 17:51:33 +0000 (UTC)
commit 273c081ce267392aaecef491bf1593385cc4a819
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Mon Apr 6 18:53:39 2020 +0200
Use Gtk namespace.
src/gnome-chess.vala | 445 +++++++++++++++++++++++++--------------------------
1 file changed, 220 insertions(+), 225 deletions(-)
---
diff --git a/src/gnome-chess.vala b/src/gnome-chess.vala
index 18ea284..46b08b1 100644
--- a/src/gnome-chess.vala
+++ b/src/gnome-chess.vala
@@ -11,6 +11,8 @@
* license.
*/
+using Gtk;
+
public class ChessApplication : Gtk.Application
{
private enum LayoutMode {
@@ -24,39 +26,39 @@ public class ChessApplication : Gtk.Application
private int window_width;
private int window_height;
- private Settings settings;
- private Gtk.ApplicationWindow window;
- private Gtk.InfoBar info_bar;
- private Gtk.Container view_container;
+ private GLib.Settings settings;
+ private ApplicationWindow window;
+ private InfoBar info_bar;
+ private Container view_container;
private ChessScene scene;
private ChessView view;
- private Gtk.Button pause_resume_button;
- private Gtk.Box navigation_box;
- private Gtk.Widget first_move_button;
- private Gtk.Widget prev_move_button;
- private Gtk.Widget next_move_button;
- private Gtk.Widget last_move_button;
- private Gtk.ComboBox history_combo;
- private Gtk.Widget white_time_label;
- private Gtk.Widget black_time_label;
- private Gtk.Widget timer_increment_label;
- private Gtk.HeaderBar headerbar;
-
- private Gtk.Dialog? preferences_dialog = null;
- private Gtk.ComboBox side_combo;
- private Gtk.ComboBox difficulty_combo;
- private Gtk.ComboBox duration_combo;
- private Gtk.ComboBox clock_type_combo;
- private Gtk.Adjustment duration_adjustment;
- private Gtk.Adjustment timer_increment_adjustment;
- private Gtk.Box custom_duration_box;
- private Gtk.Box timer_increment_box;
- private Gtk.ComboBox timer_increment_units_combo;
- private Gtk.ComboBox custom_duration_units_combo;
+ private Button pause_resume_button;
+ private Box navigation_box;
+ private Widget first_move_button;
+ private Widget prev_move_button;
+ private Widget next_move_button;
+ private Widget last_move_button;
+ private ComboBox history_combo;
+ private Widget white_time_label;
+ private Widget black_time_label;
+ private Widget timer_increment_label;
+ private HeaderBar headerbar;
+
+ private Dialog? preferences_dialog = null;
+ private ComboBox side_combo;
+ private ComboBox difficulty_combo;
+ private ComboBox duration_combo;
+ private ComboBox clock_type_combo;
+ private Adjustment duration_adjustment;
+ private Adjustment timer_increment_adjustment;
+ private Box custom_duration_box;
+ private Box timer_increment_box;
+ private ComboBox timer_increment_units_combo;
+ private ComboBox custom_duration_units_combo;
private uint save_duration_timeout = 0;
- private Gtk.FileChooserNative open_dialog = null;
- private Gtk.FileChooserNative? save_dialog = null;
- private Gtk.AboutDialog? about_dialog = null;
+ private FileChooserNative open_dialog = null;
+ private FileChooserNative? save_dialog = null;
+ private AboutDialog? about_dialog = null;
private PGNGame pgn_game;
private ChessGame game;
@@ -73,7 +75,7 @@ public class ChessApplication : Gtk.Application
Copyright © 2013–2018 Michael Catanzaro
Copyright © 2015–2016 Sahil Sareen""";
- private const ActionEntry[] app_entries =
+ private const GLib.ActionEntry[] app_entries =
{
{ "preferences", preferences_cb },
{ "help", help_cb },
@@ -89,7 +91,7 @@ Copyright © 2015–2016 Sahil Sareen""";
private const string RESIGN_ACTION_NAME = "resign";
private const string PAUSE_RESUME_ACTION_NAME = "pause-resume";
- private const ActionEntry[] window_entries =
+ private const GLib.ActionEntry[] window_entries =
{
{ NEW_GAME_ACTION_NAME, new_game_cb },
{ OPEN_GAME_ACTION_NAME, open_game_cb },
@@ -130,12 +132,12 @@ Copyright © 2015–2016 Sahil Sareen""";
private void display_no_engine_info_bar ()
{
- var label = new Gtk.Label (_("No chess engine is installed. You will not be able to play against the
computer."));
- label.set_line_wrap(true);
+ var label = new Label (_("No chess engine is installed. You will not be able to play against the
computer."));
+ label.set_line_wrap (true);
label.show ();
info_bar.get_content_area ().add (label);
- info_bar.set_message_type (Gtk.MessageType.ERROR);
+ info_bar.set_message_type (MessageType.ERROR);
info_bar.set_show_close_button (true);
info_bar.response.connect (() => info_bar.destroy ());
info_bar.show ();
@@ -145,14 +147,14 @@ Copyright © 2015–2016 Sahil Sareen""";
{
base.startup ();
- settings = new Settings ("org.gnome.Chess");
+ settings = new GLib.Settings ("org.gnome.Chess");
add_action_entries (app_entries, this);
set_accels_for_action ("app.help", {"F1"});
set_accels_for_action ("app.quit", {"<Primary>q", "<Primary>w"});
- Gtk.Builder builder = new Gtk.Builder.from_resource ("/org/gnome/Chess/ui/gnome-chess.ui");
+ Builder builder = new Builder.from_resource ("/org/gnome/Chess/ui/gnome-chess.ui");
- window = (Gtk.ApplicationWindow) builder.get_object ("gnome_chess_app");
+ window = (ApplicationWindow) builder.get_object ("gnome_chess_app");
window.set_default_size (settings.get_int ("width"), settings.get_int ("height"));
if (settings.get_boolean ("maximized"))
window.maximize ();
@@ -160,18 +162,18 @@ Copyright © 2015–2016 Sahil Sareen""";
window.window_state_event.connect (window_state_event_cb);
window.configure_event.connect (configure_event_cb);
- info_bar = (Gtk.InfoBar) builder.get_object ("info_bar");
- pause_resume_button = (Gtk.Button) builder.get_object ("pause_button");
- navigation_box = (Gtk.Box) builder.get_object ("navigation_box");
- first_move_button = (Gtk.Widget) builder.get_object ("first_move_button");
- prev_move_button = (Gtk.Widget) builder.get_object ("prev_move_button");
- next_move_button = (Gtk.Widget) builder.get_object ("next_move_button");
- last_move_button = (Gtk.Widget) builder.get_object ("last_move_button");
- history_combo = (Gtk.ComboBox) builder.get_object ("history_combo");
- white_time_label = (Gtk.Widget) builder.get_object ("white_time_label");
- black_time_label = (Gtk.Widget) builder.get_object ("black_time_label");
- view_container = (Gtk.Container) builder.get_object ("view_container");
- headerbar = (Gtk.HeaderBar) builder.get_object ("headerbar");
+ info_bar = (InfoBar) builder.get_object ("info_bar");
+ pause_resume_button = (Button) builder.get_object ("pause_button");
+ navigation_box = (Box) builder.get_object ("navigation_box");
+ first_move_button = (Widget) builder.get_object ("first_move_button");
+ prev_move_button = (Widget) builder.get_object ("prev_move_button");
+ next_move_button = (Widget) builder.get_object ("next_move_button");
+ last_move_button = (Widget) builder.get_object ("last_move_button");
+ history_combo = (ComboBox) builder.get_object ("history_combo");
+ white_time_label = (Widget) builder.get_object ("white_time_label");
+ black_time_label = (Widget) builder.get_object ("black_time_label");
+ view_container = (Container) builder.get_object ("view_container");
+ headerbar = (HeaderBar) builder.get_object ("headerbar");
builder.connect_signals (this);
update_pause_resume_button ();
@@ -268,23 +270,16 @@ Copyright © 2015–2016 Sahil Sareen""";
settings.apply ();
}
- private void set_layout_mode(LayoutMode new_layout_mode)
+ private void set_layout_mode (LayoutMode new_layout_mode)
{
if (layout_mode == new_layout_mode)
return;
layout_mode = new_layout_mode;
- Gtk.Orientation orientation;
-
- if (layout_mode == LayoutMode.NORMAL)
- orientation = Gtk.Orientation.HORIZONTAL;
- else
- orientation = Gtk.Orientation.VERTICAL;
-
- navigation_box.set_orientation(orientation);
+ navigation_box.set_orientation ((layout_mode == LayoutMode.NORMAL) ? Orientation.HORIZONTAL :
Orientation.VERTICAL);
}
- private void size_allocate_cb (Gtk.Allocation allocation)
+ private void size_allocate_cb (Allocation allocation)
{
if (is_maximized || is_tiled)
return;
@@ -304,17 +299,17 @@ Copyright © 2015–2016 Sahil Sareen""";
private bool configure_event_cb (Gdk.EventConfigure event)
{
if (event.width <= 500 && layout_mode == LayoutMode.NORMAL)
- set_layout_mode(LayoutMode.NARROW);
+ set_layout_mode (LayoutMode.NARROW);
else if (event.width > 500 && layout_mode == LayoutMode.NARROW)
- set_layout_mode(LayoutMode.NORMAL);
+ set_layout_mode (LayoutMode.NORMAL);
return Gdk.EVENT_PROPAGATE;
}
public PieceType? show_promotion_type_selector ()
{
- Gtk.Builder promotion_type_selector_builder = new Gtk.Builder.from_resource
("/org/gnome/Chess/ui/promotion-type-selector.ui");
+ Builder promotion_type_selector_builder = new Builder.from_resource
("/org/gnome/Chess/ui/promotion-type-selector.ui");
- Gtk.Dialog promotion_type_selector_dialog = promotion_type_selector_builder.get_object
("dialog_promotion_type_selector") as Gtk.Dialog;
+ Dialog promotion_type_selector_dialog = (Dialog) promotion_type_selector_builder.get_object
("dialog_promotion_type_selector");
promotion_type_selector_dialog.transient_for = window;
string color;
@@ -324,16 +319,16 @@ Copyright © 2015–2016 Sahil Sareen""";
color = "black";
var filename = Path.build_filename (PKGDATADIR, "pieces", scene.theme_name, "%sQueen.svg".printf
(color));
- set_piece_image (promotion_type_selector_builder.get_object ("image_queen") as Gtk.Image, filename);
+ set_piece_image ((Image) promotion_type_selector_builder.get_object ("image_queen"), filename);
filename = Path.build_filename (PKGDATADIR, "pieces", scene.theme_name, "%sKnight.svg".printf
(color));
- set_piece_image (promotion_type_selector_builder.get_object ("image_knight") as Gtk.Image, filename);
+ set_piece_image ((Image) promotion_type_selector_builder.get_object ("image_knight"), filename);
filename = Path.build_filename (PKGDATADIR, "pieces", scene.theme_name, "%sRook.svg".printf (color));
- set_piece_image (promotion_type_selector_builder.get_object ("image_rook") as Gtk.Image, filename);
+ set_piece_image ((Image) promotion_type_selector_builder.get_object ("image_rook"), filename);
filename = Path.build_filename (PKGDATADIR, "pieces", scene.theme_name, "%sBishop.svg".printf
(color));
- set_piece_image (promotion_type_selector_builder.get_object ("image_bishop") as Gtk.Image, filename);
+ set_piece_image ((Image) promotion_type_selector_builder.get_object ("image_bishop"), filename);
promotion_type_selector_builder.connect_signals (this);
@@ -359,10 +354,10 @@ Copyright © 2015–2016 Sahil Sareen""";
return selection;
}
- private void set_piece_image (Gtk.Image image, string filename)
+ private void set_piece_image (Image image, string filename)
{
int width, height;
- if (!Gtk.icon_size_lookup (Gtk.IconSize.DIALOG, out width, out height))
+ if (!icon_size_lookup (IconSize.DIALOG, out width, out height))
return;
try
@@ -447,7 +442,7 @@ Copyright © 2015–2016 Sahil Sareen""";
{
if (state.last_move != null)
{
- Gtk.TreeIter iter;
+ TreeIter iter;
if (history_combo.model.iter_nth_child (out iter, null, i))
set_move_text (iter, state.last_move);
}
@@ -473,7 +468,7 @@ Copyright © 2015–2016 Sahil Sareen""";
var model = (Gtk.ListStore) history_combo.model;
model.clear ();
- Gtk.TreeIter iter;
+ TreeIter iter;
model.append (out iter);
model.set (iter, 0,
/* Move History Combo: Go to the start of the game */
@@ -901,7 +896,7 @@ Copyright © 2015–2016 Sahil Sareen""";
enable_window_action (PAUSE_RESUME_ACTION_NAME);
}
- private void set_move_text (Gtk.TreeIter iter, ChessMove move)
+ private void set_move_text (TreeIter iter, ChessMove move)
{
/* Note there are no move formats for pieces taking kings and this is not allowed in Chess rules */
const string human_descriptions[] = {/* Human Move String: Description of a white pawn moving from
%1$s to %2s, e.g. 'c2 to c4' */
@@ -1129,7 +1124,7 @@ Copyright © 2015–2016 Sahil Sareen""";
scene.move_number = -1;
var model = (Gtk.ListStore) history_combo.model;
- Gtk.TreeIter iter;
+ TreeIter iter;
model.append (out iter);
model.set (iter, 1, move.number, -1);
set_move_text (iter, move);
@@ -1150,7 +1145,7 @@ Copyright © 2015–2016 Sahil Sareen""";
* redraw first, so the pieces are shown to move before displaying the
* claim draw dialog. */
var started = !starting && game.is_started;
- Timeout.add(100, () => {
+ Timeout.add (100, () => {
if (game.can_claim_draw () && started)
present_claim_draw_dialog ();
@@ -1177,7 +1172,7 @@ Copyright © 2015–2016 Sahil Sareen""";
/* Remove from the history */
var model = (Gtk.ListStore) history_combo.model;
- Gtk.TreeIter iter;
+ TreeIter iter;
model.iter_nth_child (out iter, null, model.iter_n_children (null) - 1);
model.remove (ref iter);
@@ -1277,14 +1272,14 @@ Copyright © 2015–2016 Sahil Sareen""";
if (game != null && game.is_paused)
{
- pause_resume_button.image = new Gtk.Image.from_icon_name ("media-playback-start-symbolic",
- Gtk.IconSize.BUTTON);
+ pause_resume_button.image = new Image.from_icon_name ("media-playback-start-symbolic",
+ IconSize.BUTTON);
pause_resume_button.tooltip_text = _("Unpause the game");
}
else
{
- pause_resume_button.image = new Gtk.Image.from_icon_name ("media-playback-pause-symbolic",
- Gtk.IconSize.BUTTON);
+ pause_resume_button.image = new Image.from_icon_name ("media-playback-pause-symbolic",
+ IconSize.BUTTON);
pause_resume_button.tooltip_text = _("Pause the game");
}
}
@@ -1427,7 +1422,7 @@ Copyright © 2015–2016 Sahil Sareen""";
}
[CCode (cname = "gnome_chess_app_delete_event_cb", instance_pos = -1)]
- public bool gnome_chess_app_delete_event_cb (Gtk.Widget widget, Gdk.Event event)
+ public bool gnome_chess_app_delete_event_cb (Widget widget, Gdk.Event event)
{
quit_game ();
return false;
@@ -1438,38 +1433,38 @@ Copyright © 2015–2016 Sahil Sareen""";
if (!game_needs_saving)
return true;
- var dialog = new Gtk.MessageDialog (window,
- Gtk.DialogFlags.MODAL,
- Gtk.MessageType.QUESTION,
- Gtk.ButtonsType.NONE,
- prompt_text);
- dialog.add_button (_("_Cancel"), Gtk.ResponseType.CANCEL);
+ var dialog = new MessageDialog (window,
+ DialogFlags.MODAL,
+ MessageType.QUESTION,
+ ButtonsType.NONE,
+ prompt_text);
+ dialog.add_button (_("_Cancel"), ResponseType.CANCEL);
if (game.result == ChessResult.IN_PROGRESS)
{
- dialog.add_button (_("_Abandon game"), Gtk.ResponseType.NO);
- dialog.add_button (_("_Save game for later"), Gtk.ResponseType.YES);
+ dialog.add_button (_("_Abandon game"), ResponseType.NO);
+ dialog.add_button (_("_Save game for later"), ResponseType.YES);
}
else
{
- dialog.add_button (_("_Discard game"), Gtk.ResponseType.NO);
- dialog.add_button (_("_Save game log"), Gtk.ResponseType.YES);
+ dialog.add_button (_("_Discard game"), ResponseType.NO);
+ dialog.add_button (_("_Save game log"), ResponseType.YES);
}
var result = dialog.run ();
dialog.destroy ();
- if (result == Gtk.ResponseType.CANCEL || result == Gtk.ResponseType.DELETE_EVENT)
+ if (result == ResponseType.CANCEL || result == ResponseType.DELETE_EVENT)
{
return false;
}
- else if (result == Gtk.ResponseType.YES)
+ else if (result == ResponseType.YES)
{
present_save_dialog ();
}
else
{
- warn_if_fail (result == Gtk.ResponseType.NO);
+ warn_if_fail (result == ResponseType.NO);
/* Remove completed game from history */
game_needs_saving = false;
autosave ();
@@ -1483,12 +1478,12 @@ Copyright © 2015–2016 Sahil Sareen""";
{
game.pause (false);
- var dialog = new Gtk.MessageDialog (window,
- Gtk.DialogFlags.MODAL,
- Gtk.MessageType.QUESTION,
- Gtk.ButtonsType.NONE,
- /* Title of claim draw dialog */
- _("Would you like to claim a draw?"));
+ var dialog = new MessageDialog (window,
+ DialogFlags.MODAL,
+ MessageType.QUESTION,
+ ButtonsType.NONE,
+ /* Title of claim draw dialog */
+ _("Would you like to claim a draw?"));
string reason;
if (game.is_fifty_move_rule_fulfilled ())
@@ -1506,15 +1501,15 @@ Copyright © 2015–2016 Sahil Sareen""";
dialog.secondary_text = reason;
dialog.add_buttons (/* Option in claim draw dialog */
- _("_Keep Playing"), Gtk.ResponseType.REJECT,
+ _("_Keep Playing"), ResponseType.REJECT,
/* Option in claim draw dialog */
- _("_Claim Draw"), Gtk.ResponseType.ACCEPT,
+ _("_Claim Draw"), ResponseType.ACCEPT,
null);
var response = dialog.run ();
dialog.destroy ();
- if (response == Gtk.ResponseType.ACCEPT)
+ if (response == ResponseType.ACCEPT)
{
game.current_player.claim_draw ();
}
@@ -1534,25 +1529,25 @@ Copyright © 2015–2016 Sahil Sareen""";
{
game.pause (false);
- var dialog = new Gtk.MessageDialog (window,
- Gtk.DialogFlags.MODAL,
- Gtk.MessageType.QUESTION,
- Gtk.ButtonsType.NONE,
- /* Title of warning dialog when player clicks Resign */
- _("Are you sure you want to resign?"));
+ var dialog = new MessageDialog (window,
+ DialogFlags.MODAL,
+ MessageType.QUESTION,
+ ButtonsType.NONE,
+ /* Title of warning dialog when player clicks Resign */
+ _("Are you sure you want to resign?"));
dialog.format_secondary_text (
/* Text on warning dialog when player clicks Resign */
_("This makes sense if you plan to save the game as a record of your loss."));
dialog.add_buttons (/* Option on warning dialog when player clicks resign */
- _("_Keep Playing"), Gtk.ResponseType.REJECT,
+ _("_Keep Playing"), ResponseType.REJECT,
/* Option on warning dialog when player clicks resign */
- _("_Resign"), Gtk.ResponseType.ACCEPT,
+ _("_Resign"), ResponseType.ACCEPT,
null);
var response = dialog.run ();
dialog.destroy ();
- if (response == Gtk.ResponseType.ACCEPT)
+ if (response == ResponseType.ACCEPT)
{
if (human_player != null)
human_player.resign ();
@@ -1595,7 +1590,7 @@ Copyright © 2015–2016 Sahil Sareen""";
}
[CCode (cname = "white_time_draw_cb", instance_pos = -1)]
- public bool white_time_draw_cb (Gtk.Widget widget, Cairo.Context c)
+ public bool white_time_draw_cb (Widget widget, Cairo.Context c)
{
double fg[3] = { 0.0, 0.0, 0.0 };
double bg[3] = { 1.0, 1.0, 1.0 };
@@ -1605,7 +1600,7 @@ Copyright © 2015–2016 Sahil Sareen""";
}
[CCode (cname = "black_time_draw_cb", instance_pos = -1)]
- public bool black_time_draw_cb (Gtk.Widget widget, Cairo.Context c)
+ public bool black_time_draw_cb (Widget widget, Cairo.Context c)
{
double fg[3] = { 1.0, 1.0, 1.0 };
double bg[3] = { 0.0, 0.0, 0.0 };
@@ -1667,11 +1662,11 @@ Copyright © 2015–2016 Sahil Sareen""";
return (int) Math.ceil (max) + 6;
}
- private void draw_time (Gtk.Widget widget, Cairo.Context c, string text, double[] fg, double[] bg)
+ private void draw_time (Widget widget, Cairo.Context c, string text, double[] fg, double[] bg)
{
double alpha = 1.0;
- if ((widget.get_state_flags () & Gtk.StateFlags.INSENSITIVE) != 0)
+ if ((widget.get_state_flags () & StateFlags.INSENSITIVE) != 0)
alpha = 0.5;
c.set_source_rgba (bg[0], bg[1], bg[2], alpha);
c.paint ();
@@ -1692,26 +1687,26 @@ Copyright © 2015–2016 Sahil Sareen""";
}
[CCode (cname = "history_combo_changed_cb", instance_pos = -1)]
- public void history_combo_changed_cb (Gtk.ComboBox combo)
+ public void history_combo_changed_cb (ComboBox combo)
{
- Gtk.TreeIter iter;
+ TreeIter iter;
if (!combo.get_active_iter (out iter))
return;
int move_number;
- combo.model.get (iter, 1, out move_number, -1);
+ combo.model.@get (iter, 1, out move_number, -1);
if (game == null || move_number == game.n_moves)
move_number = -1;
scene.move_number = move_number;
}
[CCode (cname = "history_latest_clicked_cb", instance_pos = -1)]
- public void history_latest_clicked_cb (Gtk.Widget widget)
+ public void history_latest_clicked_cb (Widget widget)
{
scene.move_number = -1;
}
[CCode (cname = "history_next_clicked_cb", instance_pos = -1)]
- public void history_next_clicked_cb (Gtk.Widget widget)
+ public void history_next_clicked_cb (Widget widget)
{
if (scene.move_number == -1)
return;
@@ -1724,7 +1719,7 @@ Copyright © 2015–2016 Sahil Sareen""";
}
[CCode (cname = "history_previous_clicked_cb", instance_pos = -1)]
- public void history_previous_clicked_cb (Gtk.Widget widget)
+ public void history_previous_clicked_cb (Widget widget)
{
if (scene.move_number == 0)
return;
@@ -1736,7 +1731,7 @@ Copyright © 2015–2016 Sahil Sareen""";
}
[CCode (cname = "history_start_clicked_cb", instance_pos = -1)]
- public void history_start_clicked_cb (Gtk.Widget widget)
+ public void history_start_clicked_cb (Widget widget)
{
scene.move_number = 0;
}
@@ -1749,9 +1744,9 @@ Copyright © 2015–2016 Sahil Sareen""";
return;
}
- Gtk.Builder preferences_builder = new Gtk.Builder.from_resource
("/org/gnome/Chess/ui/preferences.ui");
+ Builder preferences_builder = new Builder.from_resource ("/org/gnome/Chess/ui/preferences.ui");
- preferences_dialog = (Gtk.Dialog) preferences_builder.get_object ("preferences");
+ preferences_dialog = (Dialog) preferences_builder.get_object ("preferences");
preferences_dialog.transient_for = window;
settings.bind ("show-numbering", preferences_builder.get_object ("show_numbering_check"),
@@ -1759,17 +1754,17 @@ Copyright © 2015–2016 Sahil Sareen""";
settings.bind ("show-move-hints", preferences_builder.get_object ("show_move_hints_check"),
"active", SettingsBindFlags.DEFAULT);
- side_combo = (Gtk.ComboBox) preferences_builder.get_object ("side_combo");
+ side_combo = (ComboBox) preferences_builder.get_object ("side_combo");
side_combo.set_active (settings.get_enum ("play-as"));
- var ai_combo = (Gtk.ComboBox) preferences_builder.get_object ("opponent_combo");
+ var ai_combo = (ComboBox) preferences_builder.get_object ("opponent_combo");
var ai_model = (Gtk.ListStore) ai_combo.model;
var opponent_name = settings.get_string ("opponent");
if (opponent_name == "human")
ai_combo.set_active (0);
foreach (var p in ai_profiles)
{
- Gtk.TreeIter iter;
+ TreeIter iter;
ai_model.append (out iter);
ai_model.set (iter, 0, p.name, 1, p.name, -1);
if (p.name == opponent_name || (opponent_name == "" && ai_combo.get_active () == -1))
@@ -1781,19 +1776,19 @@ Copyright © 2015–2016 Sahil Sareen""";
settings.set_string ("opponent", "human");
}
- difficulty_combo = (Gtk.ComboBox) preferences_builder.get_object ("difficulty_combo");
+ difficulty_combo = (ComboBox) preferences_builder.get_object ("difficulty_combo");
set_combo (difficulty_combo, 1, settings.get_string ("difficulty"));
- duration_combo = (Gtk.ComboBox) preferences_builder.get_object ("duration_combo");
- clock_type_combo = (Gtk.ComboBox) preferences_builder.get_object ("clock_type_combo");
- duration_adjustment = (Gtk.Adjustment) preferences_builder.get_object ("duration_adjustment");
- timer_increment_adjustment = (Gtk.Adjustment) preferences_builder.get_object
("timer_increment_adjustment");
- custom_duration_box = (Gtk.Box) preferences_builder.get_object ("custom_duration_box");
- timer_increment_box = (Gtk.Box) preferences_builder.get_object ("timer_increment_box");
- custom_duration_units_combo = (Gtk.ComboBox) preferences_builder.get_object
("custom_duration_units_combo");
+ duration_combo = (ComboBox) preferences_builder.get_object ("duration_combo");
+ clock_type_combo = (ComboBox) preferences_builder.get_object ("clock_type_combo");
+ duration_adjustment = (Adjustment) preferences_builder.get_object ("duration_adjustment");
+ timer_increment_adjustment = (Adjustment) preferences_builder.get_object
("timer_increment_adjustment");
+ custom_duration_box = (Box) preferences_builder.get_object ("custom_duration_box");
+ timer_increment_box = (Box) preferences_builder.get_object ("timer_increment_box");
+ custom_duration_units_combo = (ComboBox) preferences_builder.get_object
("custom_duration_units_combo");
set_duration (settings.get_int ("duration"));
- timer_increment_label = (Gtk.Widget) preferences_builder.get_object ("timer_increment_label");
- timer_increment_units_combo = (Gtk.ComboBox) preferences_builder.get_object
("timer_increment_units_combo");
+ timer_increment_label = (Widget) preferences_builder.get_object ("timer_increment_label");
+ timer_increment_units_combo = (ComboBox) preferences_builder.get_object
("timer_increment_units_combo");
if (pgn_game.clock_type != null)
set_clock_type (ClockType.string_to_enum (pgn_game.clock_type));
@@ -1805,13 +1800,13 @@ Copyright © 2015–2016 Sahil Sareen""";
else
set_timer_increment (settings.get_int ("timer-increment"));
- var orientation_combo = (Gtk.ComboBox) preferences_builder.get_object ("orientation_combo");
+ var orientation_combo = (ComboBox) preferences_builder.get_object ("orientation_combo");
set_combo (orientation_combo, 1, settings.get_string ("board-side"));
- var move_combo = (Gtk.ComboBox) preferences_builder.get_object ("move_format_combo");
+ var move_combo = (ComboBox) preferences_builder.get_object ("move_format_combo");
set_combo (move_combo, 1, settings.get_string ("move-format"));
- var theme_combo = (Gtk.ComboBox) preferences_builder.get_object ("piece_style_combo");
+ var theme_combo = (ComboBox) preferences_builder.get_object ("piece_style_combo");
set_combo (theme_combo, 1, settings.get_string ("piece-theme"));
preferences_builder.connect_signals (this);
@@ -1826,16 +1821,16 @@ Copyright © 2015–2016 Sahil Sareen""";
preferences_dialog.run ();
}
- private void set_combo (Gtk.ComboBox combo, int value_index, string value)
+ private void set_combo (ComboBox combo, int value_index, string value)
{
- Gtk.TreeIter iter;
+ TreeIter iter;
var model = combo.model;
if (!model.get_iter_first (out iter))
return;
do
{
string v;
- model.get (iter, value_index, out v, -1);
+ model.@get (iter, value_index, out v, -1);
if (v == value)
{
combo.set_active_iter (iter);
@@ -1844,36 +1839,36 @@ Copyright © 2015–2016 Sahil Sareen""";
} while (model.iter_next (ref iter));
}
- private string? get_combo (Gtk.ComboBox combo, int value_index)
+ private string? get_combo (ComboBox combo, int value_index)
{
string value;
- Gtk.TreeIter iter;
+ TreeIter iter;
if (!combo.get_active_iter (out iter))
return null;
- combo.model.get (iter, value_index, out value, -1);
+ combo.model.@get (iter, value_index, out value, -1);
return value;
}
[CCode (cname = "side_combo_changed_cb", instance_pos = -1)]
- public void side_combo_changed_cb (Gtk.ComboBox combo)
+ public void side_combo_changed_cb (ComboBox combo)
{
- Gtk.TreeIter iter;
+ TreeIter iter;
if (!combo.get_active_iter (out iter))
return;
int player;
- combo.model.get (iter, 1, out player, -1);
+ combo.model.@get (iter, 1, out player, -1);
settings.set_enum ("play-as", player);
}
[CCode (cname = "opponent_combo_changed_cb", instance_pos = -1)]
- public void opponent_combo_changed_cb (Gtk.ComboBox combo)
+ public void opponent_combo_changed_cb (ComboBox combo)
{
- Gtk.TreeIter iter;
+ TreeIter iter;
if (!combo.get_active_iter (out iter))
return;
string opponent;
- combo.model.get (iter, 1, out opponent, -1);
+ combo.model.@get (iter, 1, out opponent, -1);
settings.set_string ("opponent", opponent);
bool vs_human = (combo.get_active () == 0);
side_combo.sensitive = !vs_human;
@@ -1881,20 +1876,20 @@ Copyright © 2015–2016 Sahil Sareen""";
}
[CCode (cname = "difficulty_combo_changed_cb", instance_pos = -1)]
- public void difficulty_combo_changed_cb (Gtk.ComboBox combo)
+ public void difficulty_combo_changed_cb (ComboBox combo)
{
- Gtk.TreeIter iter;
+ TreeIter iter;
if (!combo.get_active_iter (out iter))
return;
string difficulty;
- combo.model.get (iter, 1, out difficulty, -1);
+ combo.model.@get (iter, 1, out difficulty, -1);
settings.set_string ("difficulty", difficulty);
}
private void set_clock_type (int clock_type)
{
var model = clock_type_combo.model;
- Gtk.TreeIter iter, active_iter_clock_type = {};
+ TreeIter iter, active_iter_clock_type = {};
/* Find the largest units that can be used for this value */
if (model.get_iter_first (out iter))
@@ -1902,7 +1897,7 @@ Copyright © 2015–2016 Sahil Sareen""";
do
{
int type;
- model.get (iter, 1, out type, -1);
+ model.@get (iter, 1, out type, -1);
if (type == clock_type)
{
active_iter_clock_type = iter;
@@ -1926,7 +1921,7 @@ Copyright © 2015–2016 Sahil Sareen""";
timer_increment_adjustment.value = timer_increment;
var model = timer_increment_units_combo.model;
- Gtk.TreeIter iter, reqd_iter = {};
+ TreeIter iter, reqd_iter = {};
/* Find the largest units that can be used for this value */
if (model.get_iter_first (out iter))
@@ -1934,7 +1929,7 @@ Copyright © 2015–2016 Sahil Sareen""";
do
{
int multiplier;
- model.get (iter, 1, out multiplier, -1);
+ model.@get (iter, 1, out multiplier, -1);
if (multiplier == timer_increment_multiplier)
{
reqd_iter = iter;
@@ -1949,7 +1944,7 @@ Copyright © 2015–2016 Sahil Sareen""";
private void set_duration (int duration, bool simplify = true)
{
var model = custom_duration_units_combo.model;
- Gtk.TreeIter iter, max_iter = {};
+ TreeIter iter, max_iter = {};
/* Find the largest units that can be used for this value */
int max_multiplier = 0;
@@ -1958,7 +1953,7 @@ Copyright © 2015–2016 Sahil Sareen""";
do
{
int multiplier;
- model.get (iter, 1, out multiplier, -1);
+ model.@get (iter, 1, out multiplier, -1);
if (multiplier > max_multiplier && duration % multiplier == 0)
{
max_multiplier = multiplier;
@@ -1985,7 +1980,7 @@ Copyright © 2015–2016 Sahil Sareen""";
do
{
int v;
- model.get (iter, 1, out v, -1);
+ model.@get (iter, 1, out v, -1);
if (v == duration || v == -1)
{
duration_combo.set_active_iter (iter);
@@ -1997,11 +1992,11 @@ Copyright © 2015–2016 Sahil Sareen""";
private int get_duration ()
{
- Gtk.TreeIter iter;
+ TreeIter iter;
if (duration_combo.get_active_iter (out iter))
{
int duration;
- duration_combo.model.get (iter, 1, out duration, -1);
+ duration_combo.model.@get (iter, 1, out duration, -1);
if (duration >= 0)
return duration;
}
@@ -2009,7 +2004,7 @@ Copyright © 2015–2016 Sahil Sareen""";
var magnitude = (int) duration_adjustment.value;
int multiplier = 1;
if (custom_duration_units_combo.get_active_iter (out iter))
- custom_duration_units_combo.model.get (iter, 1, out multiplier, -1);
+ custom_duration_units_combo.model.@get (iter, 1, out multiplier, -1);
switch (multiplier)
{
@@ -2044,17 +2039,17 @@ Copyright © 2015–2016 Sahil Sareen""";
}
[CCode (cname = "duration_changed_cb", instance_pos = -1)]
- public void duration_changed_cb (Gtk.Adjustment adjustment)
+ public void duration_changed_cb (Adjustment adjustment)
{
var model = (Gtk.ListStore) custom_duration_units_combo.model;
- Gtk.TreeIter iter;
+ TreeIter iter;
/* Set the unit labels to the correct plural form */
if (model.get_iter_first (out iter))
{
do
{
int multiplier;
- model.get (iter, 1, out multiplier, -1);
+ model.@get (iter, 1, out multiplier, -1);
switch (multiplier)
{
case 60:
@@ -2075,23 +2070,23 @@ Copyright © 2015–2016 Sahil Sareen""";
}
[CCode (cname = "duration_units_changed_cb", instance_pos = -1)]
- public void duration_units_changed_cb (Gtk.Widget widget)
+ public void duration_units_changed_cb (Widget widget)
{
save_duration ();
}
[CCode (cname = "timer_increment_units_changed_cb", instance_pos = -1)]
- public void timer_increment_units_changed_cb (Gtk.Widget widget)
+ public void timer_increment_units_changed_cb (Widget widget)
{
var model = (Gtk.ListStore) timer_increment_units_combo.model;
- Gtk.TreeIter iter;
+ TreeIter iter;
int multiplier = 0;
/* Set the unit labels to the correct plural form */
if (model.get_iter_first (out iter))
{
do
{
- model.get (iter, 1, out multiplier, -1);
+ model.@get (iter, 1, out multiplier, -1);
switch (multiplier)
{
case 1:
@@ -2109,7 +2104,7 @@ Copyright © 2015–2016 Sahil Sareen""";
}
if (timer_increment_units_combo.get_active_iter (out iter))
- timer_increment_units_combo.model.get (iter, 1, out multiplier, -1);
+ timer_increment_units_combo.model.@get (iter, 1, out multiplier, -1);
switch (multiplier)
{
@@ -2140,13 +2135,13 @@ Copyright © 2015–2016 Sahil Sareen""";
}
[CCode (cname = "duration_combo_changed_cb", instance_pos = -1)]
- public void duration_combo_changed_cb (Gtk.ComboBox combo)
+ public void duration_combo_changed_cb (ComboBox combo)
{
- Gtk.TreeIter iter;
+ TreeIter iter;
if (!combo.get_active_iter (out iter))
return;
int duration;
- combo.model.get (iter, 1, out duration, -1);
+ combo.model.@get (iter, 1, out duration, -1);
custom_duration_box.visible = duration < 0;
clock_type_combo.sensitive = duration != 0;
@@ -2163,13 +2158,13 @@ Copyright © 2015–2016 Sahil Sareen""";
}
[CCode (cname = "clock_type_changed_cb", instance_pos = -1)]
- public void clock_type_changed_cb (Gtk.ComboBox combo)
+ public void clock_type_changed_cb (ComboBox combo)
{
- Gtk.TreeIter iter;
+ TreeIter iter;
if (!combo.get_active_iter (out iter))
return;
ClockType clock_type;
- combo.model.get (iter, 1, out clock_type, -1);
+ combo.model.@get (iter, 1, out clock_type, -1);
timer_increment_box.visible = clock_type > 0;
timer_increment_label.visible = clock_type > 0;
@@ -2177,32 +2172,32 @@ Copyright © 2015–2016 Sahil Sareen""";
}
[CCode (cname = "preferences_response_cb", instance_pos = -1)]
- public void preferences_response_cb (Gtk.Widget widget, int response_id)
+ public void preferences_response_cb (Widget widget, int response_id)
{
preferences_dialog.hide ();
}
[CCode (cname = "preferences_delete_event_cb", instance_pos = -1)]
- public bool preferences_delete_event_cb (Gtk.Widget widget, Gdk.Event event)
+ public bool preferences_delete_event_cb (Widget widget, Gdk.Event event)
{
- preferences_response_cb (widget, Gtk.ResponseType.CANCEL);
+ preferences_response_cb (widget, ResponseType.CANCEL);
return true;
}
[CCode (cname = "piece_style_combo_changed_cb", instance_pos = -1)]
- public void piece_style_combo_changed_cb (Gtk.ComboBox combo)
+ public void piece_style_combo_changed_cb (ComboBox combo)
{
settings.set_string ("piece-theme", get_combo (combo, 1));
}
[CCode (cname = "move_format_combo_changed_cb", instance_pos = -1)]
- public void move_format_combo_changed_cb (Gtk.ComboBox combo)
+ public void move_format_combo_changed_cb (ComboBox combo)
{
settings.set_string ("move-format", get_combo (combo, 1));
}
[CCode (cname = "orientation_combo_changed_cb", instance_pos = -1)]
- public void orientation_combo_changed_cb (Gtk.ComboBox combo)
+ public void orientation_combo_changed_cb (ComboBox combo)
{
settings.set_string ("board-side", get_combo (combo, 1));
}
@@ -2211,7 +2206,7 @@ Copyright © 2015–2016 Sahil Sareen""";
{
try
{
- Gtk.show_uri (window.get_screen (), "help:gnome-chess", Gtk.get_current_event_time ());
+ show_uri (window.get_screen (), "help:gnome-chess", get_current_event_time ());
}
catch (Error e)
{
@@ -2230,13 +2225,13 @@ Copyright © 2015–2016 Sahil Sareen""";
return;
}
- about_dialog = new Gtk.AboutDialog ();
+ about_dialog = new AboutDialog ();
about_dialog.transient_for = window;
about_dialog.modal = true;
about_dialog.program_name = _("Chess");
about_dialog.version = VERSION;
about_dialog.copyright = copyrights;
- about_dialog.license_type = Gtk.License.GPL_3_0;
+ about_dialog.license_type = License.GPL_3_0;
about_dialog.comments = _("A classic game of positional strategy");
about_dialog.authors = authors;
about_dialog.artists = artists;
@@ -2249,12 +2244,12 @@ Copyright © 2015–2016 Sahil Sareen""";
private void run_invalid_pgn_dialog ()
{
- var invalid_pgn_dialog = new Gtk.MessageDialog (window,
- Gtk.DialogFlags.MODAL,
- Gtk.MessageType.ERROR,
- Gtk.ButtonsType.NONE,
- _("This does not look like a valid PGN game."));
- invalid_pgn_dialog.add_button (_("_OK"), Gtk.ResponseType.OK);
+ var invalid_pgn_dialog = new MessageDialog (window,
+ DialogFlags.MODAL,
+ MessageType.ERROR,
+ ButtonsType.NONE,
+ _("This does not look like a valid PGN game."));
+ invalid_pgn_dialog.add_button (_("_OK"), ResponseType.OK);
invalid_pgn_dialog.run ();
invalid_pgn_dialog.destroy ();
@@ -2262,12 +2257,12 @@ Copyright © 2015–2016 Sahil Sareen""";
private void run_invalid_move_dialog (string error_message)
{
- var invalid_move_dialog = new Gtk.MessageDialog (window,
- Gtk.DialogFlags.MODAL,
- Gtk.MessageType.ERROR,
- Gtk.ButtonsType.NONE,
- error_message);
- invalid_move_dialog.add_button (_("_OK"), Gtk.ResponseType.OK);
+ var invalid_move_dialog = new MessageDialog (window,
+ DialogFlags.MODAL,
+ MessageType.ERROR,
+ ButtonsType.NONE,
+ error_message);
+ invalid_move_dialog.add_button (_("_OK"), ResponseType.OK);
invalid_move_dialog.run ();
invalid_move_dialog.destroy ();
@@ -2294,11 +2289,11 @@ Copyright © 2015–2016 Sahil Sareen""";
/* Show active dialog */
if (save_dialog == null)
{
- save_dialog = new Gtk.FileChooserNative (/* Title of save game dialog */
- _("Save Chess Game"),
- window, Gtk.FileChooserAction.SAVE,
- _("_Save"),
- _("_Cancel"));
+ save_dialog = new FileChooserNative (/* Title of save game dialog */
+ _("Save Chess Game"),
+ window, FileChooserAction.SAVE,
+ _("_Save"),
+ _("_Cancel"));
if (game_file != null && game_file.get_path () != autosave_filename)
save_dialog.set_filename (game_file.get_path ());
@@ -2307,13 +2302,13 @@ Copyright © 2015–2016 Sahil Sareen""";
_("Untitled Chess Game") + ".pgn");
/* Filter out non PGN files by default */
- var pgn_filter = new Gtk.FileFilter ();
+ var pgn_filter = new FileFilter ();
/* Save Game Dialog: Name of filter to show only PGN files */
pgn_filter.set_filter_name (_("PGN files"));
pgn_filter.add_pattern ("*.pgn");
save_dialog.add_filter (pgn_filter);
- var all_filter = new Gtk.FileFilter ();
+ var all_filter = new FileFilter ();
/* Save Game Dialog: Name of filter to show all files */
all_filter.set_filter_name (_("All files"));
all_filter.add_pattern ("*");
@@ -2321,7 +2316,7 @@ Copyright © 2015–2016 Sahil Sareen""";
}
var response_id = save_dialog.run ();
- if (response_id == Gtk.ResponseType.ACCEPT)
+ if (response_id == ResponseType.ACCEPT)
{
update_pgn_time_remaining ();
@@ -2338,13 +2333,13 @@ Copyright © 2015–2016 Sahil Sareen""";
}
catch (Error e)
{
- var error_dialog = new Gtk.MessageDialog (window,
- Gtk.DialogFlags.MODAL,
- Gtk.MessageType.ERROR,
- Gtk.ButtonsType.NONE,
- _("Failed to save game: %s"),
- e.message);
- error_dialog.add_button (_("_OK"), Gtk.ResponseType.OK);
+ var error_dialog = new MessageDialog (window,
+ DialogFlags.MODAL,
+ MessageType.ERROR,
+ ButtonsType.NONE,
+ _("Failed to save game: %s"),
+ e.message);
+ error_dialog.add_button (_("_OK"), ResponseType.OK);
error_dialog.run ();
error_dialog.destroy ();
@@ -2386,20 +2381,20 @@ Copyright © 2015–2016 Sahil Sareen""";
/* Show active dialog */
if (open_dialog == null)
{
- open_dialog = new Gtk.FileChooserNative (/* Title of load game dialog */
- _("Load Chess Game"),
- window, Gtk.FileChooserAction.OPEN,
- _("_Open"),
- _("_Cancel"));
+ open_dialog = new FileChooserNative (/* Title of load game dialog */
+ _("Load Chess Game"),
+ window, FileChooserAction.OPEN,
+ _("_Open"),
+ _("_Cancel"));
/* Filter out non PGN files by default */
- var pgn_filter = new Gtk.FileFilter ();
+ var pgn_filter = new FileFilter ();
/* Load Game Dialog: Name of filter to show only PGN files */
pgn_filter.set_filter_name (_("PGN files"));
pgn_filter.add_pattern ("*.pgn");
open_dialog.add_filter (pgn_filter);
- var all_filter = new Gtk.FileFilter ();
+ var all_filter = new FileFilter ();
/* Load Game Dialog: Name of filter to show all files */
all_filter.set_filter_name (_("All files"));
all_filter.add_pattern ("*");
@@ -2407,7 +2402,7 @@ Copyright © 2015–2016 Sahil Sareen""";
}
var response_id = open_dialog.run ();
- if (response_id == Gtk.ResponseType.ACCEPT)
+ if (response_id == ResponseType.ACCEPT)
{
game_file = open_dialog.get_file ();
open_dialog.destroy ();
@@ -2520,7 +2515,7 @@ Copyright © 2015–2016 Sahil Sareen""";
Intl.textdomain (GETTEXT_PACKAGE);
Environment.set_application_name (_("Chess"));
- Gtk.Window.set_default_icon_name ("org.gnome.Chess");
+ Window.set_default_icon_name ("org.gnome.Chess");
return new ChessApplication ().run (args);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
