← Back to branch summary

~ubuntu-branches/ubuntu/wily/gnome-do/wily

« back to all changes in this revision

Viewing changes to Do/gtk-gui/gui.stetic

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers
  • Date: 2011-02-15 21:50:02 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110215215002-1j8ylb69o15asb06
Tags: 0.8.4-0ubuntu1
http://bugs.debian.org/565591
https://launchpad.net/bugs/450852
http://bugs.debian.org/603876
https://launchpad.net/bugs/553643
* The Race Against FF upload.  Merge from unreleased Debian git.
  Remaining Ubuntu changes:
  + debian/patches/05_disable_resize_grips.patch.diff:
    Disable resize handles for the Do windows.
  + debian/control:
    Bump gtk# build dep for HasResizeGrip API.
* New Debian changes:
* The long fortold release
  + Fixes a threadsafety issue resulting in 100% CPU usage (Closes: 565591,
    LP: #450852).
  + Proxies all keyring calls to the GTK main thread, as required by the new
    gnome-keyring (Closes: 603876, LP: #553643)
* debian/patches/00_bundledlibs.dpatch:
* debian/rules:
  + Upstream has dropped bundled gmcs binary; now 100% DFSG-free, so we don't
    have to repack the tarball or patch the buildsystem.
* debian/patches/03_disable_docky.dpatch:
  + Drop.  Docky is now gone in the upstream tarball.
* debian/rules:
* debian/control:
* debian/patches/*:
  + Switch to quilt to harmonise with other pkg-cli-* packages.
* debian/control:
  + Drop recommends on gnome-do-docklets.  Docky is now a separate package,
    so the docklets are useless for Do.
  + Bump Breaks on gnome-do-plugins to 0.8.3.  Do no longer provides the Wink
    library, which has been imported into the 0.8.3 do-plugins sources.
  + Bump standards-version; no changes needed.
  + Migrate to git and update VCS fields appropriately

Show diffs side-by-side

added added

removed removed

Lines of Context:
Do/gtk-gui/gui.stetic
5
5
    <target-gtk-version>2.12</target-gtk-version>
6
6
  </configuration>
7
7
  <import>
8
 
    <widget-library name="Mono.Addins.Gui, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
 
8
    <widget-library name="../../Do.Platform/bin/Debug/Do.Platform.dll" />
9
9
    <widget-library name="../../Do.Platform.Linux/bin/Debug/Do.Platform.Linux.dll" />
10
10
    <widget-library name="../../Do.Interface.Linux/bin/Debug/Do.Interface.Linux.dll" />
 
11
    <widget-library name="Mono.Addins.Gui, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
11
12
    <widget-library name="../../Do.Interface.Linux.AnimationBase/bin/Debug/Do.Interface.Linux.AnimationBase.dll" />
12
13
    <widget-library name="../bin/Debug/Do.exe" internal="true" />
13
14
  </import>
136
137
                <property name="Position">0</property>
137
138
                <property name="AutoSize">False</property>
138
139
                <property name="Expand">False</property>
 
140
                <property name="Fill">False</property>
139
141
              </packing>
140
142
            </child>
141
143
            <child>
143
145
                <property name="MemberName" />
144
146
                <property name="Ypad">1</property>
145
147
                <property name="Xalign">0</property>
146
 
                <property name="LabelProp" translatable="yes">To edit a shortcut, double-click it and type a new one.</property>
 
148
                <property name="LabelProp" translatable="yes">To edit a shortcut, double-click it and type a new one.
 
149
To restore a shortcut to the default, double click and press Backspace.</property>
147
150
                <property name="Wrap">True</property>
148
151
              </widget>
149
152
              <packing>
534
537
    <property name="WindowPosition">CenterOnParent</property>
535
538
    <property name="Buttons">2</property>
536
539
    <property name="HelpButton">False</property>
537
 
    <property name="HasSeparator">False</property>
538
540
    <child internal-child="VBox">
539
541
      <widget class="Gtk.VBox" id="dialog1_VBox">
540
542
        <property name="MemberName" />
927
929
    <property name="WindowPosition">CenterOnParent</property>
928
930
    <property name="Buttons">1</property>
929
931
    <property name="HelpButton">False</property>
930
 
    <property name="HasSeparator">False</property>
931
932
    <child internal-child="VBox">
932
933
      <widget class="Gtk.VBox" id="dialog1_VBox">
933
934
        <property name="MemberName" />