[PATCH] alignment stuff : 1rst patch (addendum for qt)

[Alain Castera]

Refering to :
http://marc.theaimsgroup.com/?l=lyx-devel&m=106605271823294&w=2

Here is an attempt for qt. Works well except for locale lang 
support,though.


Alain

-- 
 *******************************************************************
 *        Alain Castera                                            *
 * IPNL - UCB Lyon 1             | e-mail : [EMAIL PROTECTED] *
 * Bat. Paul Dirac               |      or        [EMAIL PROTECTED] *
 * Campus de la Doua             | Telephone :     (+33) 472448429 *
 * F69622 Villeurbanne CEDEX     | Fax :           (+33) 472448004 *
 *******************************************************************

Index: src/frontends/qt2/QParagraph.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/qt2/QParagraph.C,v
retrieving revision 1.30
diff -u -r1.30 QParagraph.C
--- src/frontends/qt2/QParagraph.C      2003/10/06 15:42:50     1.30
+++ src/frontends/qt2/QParagraph.C      2003/10/14 12:36:49
@@ -177,8 +177,9 @@
        case 3:
                align = LYX_ALIGN_CENTER;
                break;
+       case 4:
        default:
-               align = LYX_ALIGN_BLOCK;
+               align = LYX_ALIGN_LAYOUT;
        }
        params.align(align);
 
@@ -309,7 +310,14 @@
 
        // alignment
        int i;
-       switch (params.align()) {
+       LyXAlignment align;
+       if (params.alignDefault()) 
+         align = controller().alignDefault();
+       else align = params.align(); 
+       switch (align) {
+       case LYX_ALIGN_BLOCK:
+               i = 0;
+               break;
        case LYX_ALIGN_LEFT:
                i = 1;
                break;
@@ -323,6 +331,12 @@
                i = 0;
                break;
        }
+       // indicates default value
+       QString label = _("default (");
+       label += dialog_->align->text(i);
+       label += _(")");
+
+       if (params.alignDefault()) i=4;
        dialog_->align->setCurrentItem(i);
 
 
Index: src/frontends/qt2/ui/QParagraphDialogBase.ui
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/qt2/ui/QParagraphDialogBase.ui,v
retrieving revision 1.7
diff -u -r1.7 QParagraphDialogBase.ui
--- src/frontends/qt2/ui/QParagraphDialogBase.ui        2003/03/28 19:45:53     1.7
+++ src/frontends/qt2/ui/QParagraphDialogBase.ui        2003/10/14 12:36:50
@@ -89,9 +89,22 @@
                                 <string>Center</string>
                             </property>
                         </item>
+                        <item>
+                            <property name="text">
+                                <string>default (Justified)</string>
+                            </property>
+                        </item>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>align</cstring>
+                        </property>
+                        <property name="sizePolicy">
+                            <sizepolicy>
+                                <hsizetype>3</hsizetype>
+                                <vsizetype>0</vsizetype>
+                                <horstretch>0</horstretch>
+                                <verstretch>0</verstretch>
+                            </sizepolicy>
                         </property>
                     </widget>
                     <widget row="1"  column="2" >