r13226 - in software/ui: debian/patches src

[Petter Reinholdtsen]

Author: pere
Date: 2012-02-12 05:15:01 +0000 (Sun, 12 Feb 2012)
New Revision: 13226

Removed:
   software/ui/debian/patches/gui-resize.patch
Modified:
   software/ui/debian/patches/series
   software/ui/src/ui.fld
Log:
Apply gui-resize.patch.

Deleted: software/ui/debian/patches/gui-resize.patch
===================================================================
--- software/ui/debian/patches/gui-resize.patch	2012-02-12 05:13:26 UTC (rev 13225)
+++ software/ui/debian/patches/gui-resize.patch	2012-02-12 05:15:01 UTC (rev 13226)
@@ -1,42 +0,0 @@
-Description: 
-   * Make enough room for the "Already installed" text (Closes:
-     #544532).  Patch by Timo Juhani Lindfors.
-Author: Timo Juhani Lindfors
-Forwarded: no
-Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
-Last-Update: 2012-02-11
-Bug-Debian: http://bugs.debian.org/544532
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- goplay-0.4.orig/src/ui.fld
-+++ goplay-0.4/src/ui.fld
-@@ -1,5 +1,5 @@
- # data file for the Fltk User Interface Designer (fluid)
--version 1.0107 
-+version 1.0109 
- i18n_type 1 
- i18n_include "common.h" 
- i18n_function _ 
-@@ -104,8 +106,8 @@ if (DebTagsBrowser)
-           xywh {13 25 312 30}
-         } {
-           Fl_Round_Button AlreadyInstalled {
--            label {Already installed}
--            xywh {13 28 110 20} down_box ROUND_DOWN_BOX labelsize 12
-+            label {Already installed} selected
-+            xywh {13 28 122 20} down_box ROUND_DOWN_BOX labelsize 12
-           }
-           Fl_Round_Button ToBeInstalled {
-             label {To be installed}

Modified: software/ui/debian/patches/series
===================================================================
--- software/ui/debian/patches/series	2012-02-12 05:13:26 UTC (rev 13225)
+++ software/ui/debian/patches/series	2012-02-12 05:15:01 UTC (rev 13226)
@@ -1,4 +1,3 @@
-gui-resize.patch
 strtol-warnings.patch
 clicktorun.patch
 generated.patch

Modified: software/ui/src/ui.fld
===================================================================
--- software/ui/src/ui.fld	2012-02-12 05:13:26 UTC (rev 13225)
+++ software/ui/src/ui.fld	2012-02-12 05:15:01 UTC (rev 13226)
@@ -104,8 +104,8 @@
           xywh {13 25 312 30}
         } {
           Fl_Round_Button AlreadyInstalled {
-            label {Already installed}
-            xywh {13 28 110 20} down_box ROUND_DOWN_BOX labelsize 12
+            label {Already installed} selected
+            xywh {13 28 122 20} down_box ROUND_DOWN_BOX labelsize 12
           }
           Fl_Round_Button ToBeInstalled {
             label {To be installed}