[geary/wip/714793-orientation2] Revert "Add orientation icons"
- From: Robert Schroll <rschroll src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/714793-orientation2] Revert "Add orientation icons"
- Date: Mon, 9 Mar 2015 18:24:44 +0000 (UTC)
commit 2f2950a4efcecb40e33ee39719270ae0964527a2
Author: Robert Schroll <rschroll gmail com>
Date: Mon Mar 9 00:23:26 2015 -0400
Revert "Add orientation icons"
This reverts commit eb9e8ba5f54f9a165d55a27554c08a94d98b88a1.
icons/CMakeLists.txt | 2 -
icons/layout-horizontal-symbolic.svg | 90 --------------------------------
icons/layout-vertical-symbolic.svg | 89 -------------------------------
src/client/components/main-window.vala | 8 +---
src/client/components/status-bar.vala | 3 -
5 files changed, 1 insertions(+), 191 deletions(-)
---
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index bf3a56c..f974ff7 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -7,8 +7,6 @@ set(ICON_FILES
text-x-generic-symbolic.svg
edit-symbolic.svg
format-text-remove-symbolic.svg
- layout-horizontal-symbolic.svg
- layout-vertical-symbolic.svg
mail-forward-symbolic.svg
mail-forward-rtl-symbolic.svg
mail-inbox-symbolic.svg
diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala
index c5b7593..8522615 100644
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@ -224,8 +224,6 @@ public class MainWindow : Gtk.ApplicationWindow {
spinner.set_size_request(STATUS_BAR_HEIGHT - 2, -1);
status_bar.add(spinner);
- orientation_button.margin_right = 10;
- orientation_button.relief = Gtk.ReliefStyle.NONE;
status_bar.pack_start(orientation_button, false, false, 0);
status_bar.reorder_child(orientation_button, 0);
@@ -364,11 +362,7 @@ public class MainWindow : Gtk.ApplicationWindow {
private void on_orientation_changed() {
bool horizontal = (folder_paned.orientation == Gtk.Orientation.HORIZONTAL);
- Gtk.Image image = new Gtk.Image.from_icon_name(
- horizontal ? "layout-vertical-symbolic" : "layout-horizontal-symbolic",
- Gtk.IconSize.MENU);
- image.set_pixel_size(16);
- orientation_button.image = image;
+ orientation_button.label = horizontal ? "H" : "I";
// Cancels previous binding
GearyApplication.instance.config.bind(
horizontal ? Configuration.FOLDER_LIST_PANE_POSITION_HORIZONTAL_KEY
diff --git a/src/client/components/status-bar.vala b/src/client/components/status-bar.vala
index ed05dda..95cfb7c 100644
--- a/src/client/components/status-bar.vala
+++ b/src/client/components/status-bar.vala
@@ -60,9 +60,6 @@ public class StatusBar : Gtk.Statusbar {
public StatusBar() {
set_context_id(Context.OUTBOX);
- margin_top = 2;
- margin_bottom = 2;
- margin_left = 0;
}
private void set_context_id(Context context) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]