Scratch

Merge lp:~codygarver/scratch/scratch-drop-fullscreen into lp:~elementary-apps/scratch/scratch

  1. scratch-drop-fullscreen
  2. Merge into scratch
Proposed by Cody Garver
Status: Merged
Approved by: Danielle Foré
Approved revision: 1315
Merged at revision: 1315
Proposed branch: lp:~codygarver/scratch/scratch-drop-fullscreen
Merge into: lp:~elementary-apps/scratch/scratch
Diff against target: 58 lines (+0/-21)
1 file modified
src/MainWindow.vala (+0/-21)
To merge this branch: bzr merge lp:~codygarver/scratch/scratch-drop-fullscreen
Reviewer Review Type Date Requested Status
Danielle Foré Approve
Review via email: mp+226055@code.launchpad.net

Commit message

Drop Fullscreen

Description of the change

Do. We. Need. It.

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/MainWindow.vala'
2--- src/MainWindow.vala 2014-06-04 20:11:34 +0000
3+++ src/MainWindow.vala 2014-07-09 01:28:18 +0000
4@@ -116,7 +116,6 @@
5 main_actions = new Gtk.ActionGroup ("MainActionGroup"); /* Actions and UIManager */
6 main_actions.set_translation_domain (Constants.GETTEXT_PACKAGE);
7 main_actions.add_actions (main_entries, this);
8- main_actions.add_toggle_actions (toggle_entries, this);
9
10 // UIManager
11 ui = new Gtk.UIManager ();
12@@ -402,8 +401,6 @@
13
14 if (Scratch.saved_state.window_state == ScratchWindowState.MAXIMIZED)
15 maximize ();
16- else if (Scratch.saved_state.window_state == ScratchWindowState.FULLSCREEN)
17- fullscreen ();
18 else
19 this.move (Scratch.saved_state.window_x, Scratch.saved_state.window_y);
20 }
21@@ -421,8 +418,6 @@
22 // Save window state
23 if (get_window ().get_state () == WindowState.MAXIMIZED)
24 Scratch.saved_state.window_state = ScratchWindowState.MAXIMIZED;
25- else if (get_window ().get_state () == WindowState.FULLSCREEN)
26- Scratch.saved_state.window_state = ScratchWindowState.FULLSCREEN;
27 else
28 Scratch.saved_state.window_state = ScratchWindowState.NORMAL;
29
30@@ -556,15 +551,6 @@
31 split_view.remove_view ();
32 }
33
34- void action_fullscreen () {
35- if ((get_window ().get_state () & WindowState.FULLSCREEN) != 0) {
36- this.unfullscreen ();
37- }
38- else {
39- this.fullscreen ();
40- }
41- }
42-
43 void action_fetch () {
44 if (toggle_searchbar ()) {
45 var selected_text = this.get_current_document ().get_selected_text ();
46@@ -731,12 +717,5 @@
47 /* tooltip */ null,
48 action_to_upper_case }
49 };
50-
51- static const Gtk.ToggleActionEntry[] toggle_entries = {
52- { "Fullscreen", Gtk.Stock.FULLSCREEN,
53- /* label, accelerator */ N_("Fullscreen"), "F11",
54- /* tooltip */ N_("Fullscreen"),
55- action_fullscreen }
56- };
57 }
58 }

Subscribers

People subscribed via source and target branches