[Xfce4-commits] <xfce4-settings:master> Drop the now unused old 1.2 dialog.
Nick Schermer
noreply at xfce.org
Sat Aug 28 23:04:29 CEST 2010
Updating branch refs/heads/master
to ee2332be7c9efe4df09a1b0fd33b9dcb04284ece (commit)
from d28cf87b40da416ff7da7feb8902093d51d9aee4 (commit)
commit ee2332be7c9efe4df09a1b0fd33b9dcb04284ece
Author: Lionel Le Folgoc <mrpouit at gmail.com>
Date: Sat Jun 19 23:18:11 2010 +0200
Drop the now unused old 1.2 dialog.
dialogs/display-settings/Makefile.am | 6 -
.../display-dialog-xrandr1.2.glade | 188 --------------------
2 files changed, 0 insertions(+), 194 deletions(-)
diff --git a/dialogs/display-settings/Makefile.am b/dialogs/display-settings/Makefile.am
index 65aeb1f..987a2e6 100644
--- a/dialogs/display-settings/Makefile.am
+++ b/dialogs/display-settings/Makefile.am
@@ -19,7 +19,6 @@ xfce4_display_settings_SOURCES = \
xfce-randr-legacy.c \
xfce-randr-legacy.h \
display-dialog_ui.h \
- display-dialog-xrandr1.2_ui.h \
minimal-display-dialog_ui.h \
display-name.c \
edid-parse.c \
@@ -48,15 +47,11 @@ if MAINTAINER_MODE
BUILT_SOURCES = \
display-dialog_ui.h \
- display-dialog-xrandr1.2_ui.h \
minimal-display-dialog_ui.h
display-dialog_ui.h: display-dialog.glade
exo-csource --static --strip-comments --strip-content --name=display_dialog_ui $< >$@
-display-dialog-xrandr1.2_ui.h: display-dialog-xrandr1.2.glade
- exo-csource --static --strip-comments --strip-content --name=display_dialog_xrandr12_ui $< >$@
-
minimal-display-dialog_ui.h: minimal-display-dialog.glade
exo-csource --static --strip-comments --strip-content --name=minimal_display_dialog_ui $< >$@
@@ -71,7 +66,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_files) \
display-dialog.glade \
- display-dialog-xrandr1.2.glade \
minimal-display-dialog.glade
DISTCLEANFILES = \
diff --git a/dialogs/display-settings/display-dialog-xrandr1.2.glade b/dialogs/display-settings/display-dialog-xrandr1.2.glade
deleted file mode 100644
index e18f465..0000000
--- a/dialogs/display-settings/display-dialog-xrandr1.2.glade
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0"?>
-<interface>
- <requires lib="gtk+" version="2.14"/>
- <!-- interface-requires libxfce4ui 4.5 -->
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="XfceTitledDialog" id="display-dialog">
- <property name="title" translatable="yes">Display</property>
- <property name="window_position">center-on-parent</property>
- <property name="default_width">400</property>
- <property name="default_height">350</property>
- <property name="icon_name">video-display</property>
- <property name="type_hint">dialog</property>
- <property name="has_separator">False</property>
- <property name="subtitle" translatable="yes">Configure screen settings and layout</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="border_width">12</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="width_request">200</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <object class="GtkTreeView" id="randr-outputs">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <property name="enable_search">False</property>
- <property name="show_expanders">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Re_flection:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">randr-reflection</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Ro_tation:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">randr-rotation</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">M_ode:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">randr-mode</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="randr-reflection">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="randr-rotation">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="randr-mode">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button-apply">
- <property name="label">gtk-apply</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Apply any changes and test the new display settings</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button-close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="1">button-apply</action-widget>
- <action-widget response="0">button-close</action-widget>
- </action-widgets>
- </object>
-</interface>
More information about the Xfce4-commits
mailing list