[Libreoffice-commits] core.git: 2 commits - cui/uiconfig padmin/source

Caolán McNamara caolanm at redhat.com
Fri Mar 7 08:57:45 PST 2014


 cui/uiconfig/ui/customize.ui | 1525 -------------------------------------------
 padmin/source/adddlg.cxx     |  294 --------
 padmin/source/adddlg.hxx     |    4 
 padmin/source/padialog.hrc   |    9 
 padmin/source/padialog.src   |   55 -
 5 files changed, 32 insertions(+), 1855 deletions(-)

New commits:
commit f118539fd18f7455d1bf4c4d6d1fa18ce04ebf90
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 7 16:54:08 2014 +0000

    drop 'import old drivers from StarOffice support'
    
    at this stage we no longer need it
    
    Change-Id: Ibfa94253b58a8e846fe6b0623098fd29e3f782f1

diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 122a2b7..30fc8a2 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -51,22 +51,17 @@ APChooseDevicePage::APChooseDevicePage( AddPrinterDialog* pParent ) :
         m_aPrinterBtn( this, PaResId( RID_ADDP_CHDEV_BTN_PRINTER ) ),
         m_aFaxBtn( this, PaResId( RID_ADDP_CHDEV_BTN_FAX ) ),
         m_aPDFBtn( this, PaResId( RID_ADDP_CHDEV_BTN_PDF ) ),
-        m_aOldBtn( this, PaResId( RID_ADDP_CHDEV_BTN_OLD ) ),
         m_aOverTxt( this, PaResId( RID_ADDP_CHDEV_TXT_OVER ) )
 {
     FreeResource();
     m_aPrinterBtn.Check( true );
     m_aFaxBtn.Check( false );
     m_aPDFBtn.Check( false );
-    m_aOldBtn.Check( false );
-    if( AddPrinterDialog::getOldPrinterLocation().isEmpty() )
-        m_aOldBtn.Enable( false );
     if( ! PrinterInfoManager::get().addOrRemovePossible() )
     {
         m_aPrinterBtn.Check( false );
         m_aFaxBtn.Check( true );
         m_aPrinterBtn.Enable( false );
-        m_aOldBtn.Enable( false );
     }
 }
 
@@ -468,196 +463,6 @@ void APCommandPage::fill( PrinterInfo& rInfo )
     rInfo.m_aCommand = m_aCommandBox.GetText();
 }
 
-
-
-APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
-        : APTabPage( pParent, PaResId( RID_ADDP_PAGE_OLDPRINTERS ) ),
-          m_aOldPrinterTxt( this, PaResId( RID_ADDP_OLD_TXT_PRINTERS ) ),
-          m_aOldPrinterBox( this, PaResId( RID_ADDP_OLD_BOX_PRINTERS ) ),
-          m_aSelectAllBtn( this, PaResId( RID_ADDP_OLD_BTN_SELECTALL ) )
-{
-    FreeResource();
-
-    m_aSelectAllBtn.SetClickHdl( LINK( this, APOldPrinterPage, ClickBtnHdl ) );
-    rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-
-    OUString aFileName( AddPrinterDialog::getOldPrinterLocation() );
-    Config aConfig( aFileName );
-
-    // read defaults
-    aConfig.SetGroup( "Xprinter,PostScript" );
-    OString aDefPageSize( aConfig.ReadKey( "PageSize" ) );
-    OString aDefOrientation( aConfig.ReadKey( "Orientation" ) );
-    OString aDefMarginLeft( aConfig.ReadKey( "MarginLeft" ) );
-    OString aDefMarginRight( aConfig.ReadKey( "MarginRight" ) );
-    OString aDefMarginTop( aConfig.ReadKey( "MarginTop" ) );
-    OString aDefMarginBottom( aConfig.ReadKey( "MarginBottom" ) );
-    OString aDefScale( aConfig.ReadKey( "Scale" ) );
-
-    aConfig.SetGroup( "devices" );
-    int nDevices = aConfig.GetKeyCount();
-    for( int nKey = 0; nKey < nDevices; nKey++ )
-    {
-        aConfig.SetGroup( "devices" );
-        OString aPrinter(aConfig.GetKeyName(nKey));
-        OString aValue(aConfig.ReadKey(aPrinter));
-        OString aPort(aValue.getToken(1, ','));
-        OString aDriver(aValue.getToken(0, ' '));
-        OString aPS( aValue.getToken(0, ',').getToken(1, ' ') );
-        OString aNewDriver(aDriver);
-        if( aDriver == "GENERIC")
-            aNewDriver = OString("SGENPRT");
-
-        if( aPS != "PostScript" )
-            continue;
-
-        const PPDParser* pParser = PPDParser::getParser(OStringToOUString(aNewDriver, aEncoding));
-        if( pParser == NULL )
-        {
-            OUString aText( PaResId( RID_TXT_DRIVERDOESNOTEXIST ) );
-            aText = aText.replaceFirst( OUString(  "%s1"  ), OStringToOUString(aPrinter, aEncoding) );
-            aText = aText.replaceFirst( OUString(  "%s2"  ), OStringToOUString(aDriver, aEncoding) );
-            InfoBox aBox( this, aText );
-            aBox.Execute();
-            continue;
-        }
-
-        // read the command
-        aConfig.SetGroup( "ports" );
-        OString aCommand( aConfig.ReadKey( aPort ) );
-        if (!aCommand.isEmpty())
-        {
-            OUString aText( PaResId( RID_TXT_PRINTERWITHOUTCOMMAND ) );
-            aText = aText.replaceFirst( OUString(  "%s"  ), OStringToOUString(aPrinter, aEncoding) );
-            InfoBox aBox( this, aText );
-            aBox.Execute();
-            continue;
-        }
-
-
-        OUString aUPrinter( AddPrinterDialog::uniquePrinterName(OStringToOUString(aPrinter, aEncoding)) );
-
-        PrinterInfo aInfo;
-        aInfo.m_aDriverName = OStringToOUString(aNewDriver, aEncoding);
-        aInfo.m_pParser         = pParser;
-        aInfo.m_aContext.setParser( pParser );
-        aInfo.m_aPrinterName    = aUPrinter;
-        aInfo.m_aCommand = OStringToOUString(aCommand, aEncoding);
-
-        // read the printer settings
-        OStringBuffer aGroup(aDriver);
-        aGroup.append(",PostScript,");
-        aGroup.append(aPort);
-        aConfig.SetGroup(aGroup.makeStringAndClear());
-
-        aValue = aConfig.ReadKey( "PageSize", aDefPageSize );
-        int nLeft, nRight, nTop, nBottom;
-        if( !aValue.isEmpty() &&
-            aInfo.m_pParser->getMargins( OStringToOUString(aValue, aEncoding),
-                                         nLeft, nRight, nTop, nBottom ) )
-        {
-            const PPDKey* pKey = aInfo.m_pParser->getKey( OUString(  "PageSize"  ) );
-            const PPDValue* pValue = pKey ? pKey->getValue( OStringToOUString(aValue, aEncoding) ) : NULL;
-            if( pKey && pValue )
-                aInfo.m_aContext.setValue( pKey, pValue );
-            aValue = aConfig.ReadKey( "MarginLeft", aDefMarginLeft );
-            if (!aValue.isEmpty())
-                aInfo.m_nLeftMarginAdjust = aValue.toInt32() - (int)((double)nLeft * 35.27777778 );
-            aValue = aConfig.ReadKey( "MarginRight", aDefMarginRight );
-            if (!aValue.isEmpty())
-                aInfo.m_nRightMarginAdjust = aValue.toInt32() - (int)((double)nRight * 35.27777778 );
-            aValue = aConfig.ReadKey( "MarginTop", aDefMarginTop );
-            if (!aValue.isEmpty())
-                aInfo.m_nTopMarginAdjust = aValue.toInt32() - (int)((double)nTop * 35.27777778 );
-            aValue = aConfig.ReadKey( "MarginBottom", aDefMarginBottom );
-            if (!aValue.isEmpty())
-                aInfo.m_nBottomMarginAdjust = aValue.toInt32() - (int)((double)nBottom * 35.27777778 );
-        }
-
-        aValue = aConfig.ReadKey( "Copies", aDefScale );
-        if (!aValue.isEmpty())
-            aInfo.m_nCopies = aValue.toInt32();
-
-        aValue = aConfig.ReadKey( "Comment" );
-        aInfo.m_aComment = OStringToOUString(aValue, aEncoding);
-
-        aValue = aConfig.ReadKey( "Level" );
-        if (!aValue.isEmpty())
-            aInfo.m_nPSLevel = aValue.toInt32();
-
-        aValue = aConfig.ReadKey( "Orientation", aDefOrientation );
-        if (!aValue.isEmpty())
-            aInfo.m_eOrientation = aValue.equalsIgnoreAsciiCase("landscape") ? orientation::Landscape : orientation::Portrait;
-        int nGroupKeys = aConfig.GetKeyCount();
-        for( int nPPDKey = 0; nPPDKey < nGroupKeys; nPPDKey++ )
-        {
-            OString aPPDKey( aConfig.GetKeyName( nPPDKey ) );
-            // ignore page region
-            // there are some ppd keys in old Xpdefaults that
-            // should never have been writte because they are defaults
-            // PageRegion leads to problems in conjunction
-            // with a not matching PageSize
-            if (aPPDKey.match("PPD_") && aPPDKey != "PPD_PageRegion")
-            {
-                aValue = aConfig.ReadKey( nPPDKey );
-                aPPDKey = aPPDKey.copy(4);
-                const PPDKey* pKey = aInfo.m_pParser->getKey( OStringToOUString(aPPDKey, RTL_TEXTENCODING_ISO_8859_1) );
-                const PPDValue* pValue = pKey ? ( aValue == "*nil" ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)) ) : NULL;
-                if( pKey )
-                    aInfo.m_aContext.setValue( pKey, pValue, true );
-            }
-        }
-
-        m_aOldPrinters.push_back( aInfo );
-        int nPos = m_aOldPrinterBox.InsertEntry( aInfo.m_aPrinterName );
-        m_aOldPrinterBox.SetEntryData( nPos, & m_aOldPrinters.back() );
-    }
-}
-
-APOldPrinterPage::~APOldPrinterPage()
-{
-}
-
-IMPL_LINK( APOldPrinterPage, ClickBtnHdl, PushButton*, pButton )
-{
-    if( pButton == &m_aSelectAllBtn )
-    {
-        for( int i = 0; i < m_aOldPrinterBox.GetEntryCount(); i++ )
-            m_aOldPrinterBox.SelectEntryPos( i );
-    }
-    return 0;
-}
-
-void APOldPrinterPage::addOldPrinters()
-{
-    PrinterInfoManager& rManager( PrinterInfoManager::get() );
-    for( int i = 0; i < m_aOldPrinterBox.GetSelectEntryCount(); i++ )
-    {
-        PrinterInfo* pInfo = (PrinterInfo*)m_aOldPrinterBox.GetEntryData( m_aOldPrinterBox.GetSelectEntryPos( i ) );
-        pInfo->m_aPrinterName = AddPrinterDialog::uniquePrinterName( pInfo->m_aPrinterName );
-        if( ! rManager.addPrinter( pInfo->m_aPrinterName, pInfo->m_aDriverName ) )
-        {
-            OUString aText( PaResId( RID_TXT_PRINTERADDFAILED ) );
-            aText = aText.replaceFirst( OUString(  "%s"  ), pInfo->m_aPrinterName );
-                ErrorBox aBox( this, WB_OK | WB_DEF_OK, aText );
-                aBox.Execute();
-                continue;
-        }
-        rManager.changePrinterInfo( pInfo->m_aPrinterName, *pInfo );
-    }
-}
-
-bool APOldPrinterPage::check()
-{
-    return m_aOldPrinterBox.GetEntryCount() > 0;
-}
-
-void APOldPrinterPage::fill( PrinterInfo& )
-{
-}
-
-
-
 APFaxDriverPage::APFaxDriverPage( AddPrinterDialog* pParent )
         : APTabPage( pParent, PaResId( RID_ADDP_PAGE_FAXDRIVER ) ),
           m_aFaxTxt( this, PaResId( RID_ADDP_FAXDRV_TXT_DRIVER ) ),
@@ -737,7 +542,6 @@ AddPrinterDialog::AddPrinterDialog( Window* pParent )
           m_pCommandPage( NULL ),
           m_pChooseDriverPage( NULL ),
           m_pNamePage( NULL ),
-          m_pOldPrinterPage( NULL ),
           m_pFaxDriverPage( NULL ),
           m_pFaxSelectDriverPage( NULL ),
           m_pFaxNamePage( NULL ),
@@ -765,32 +569,18 @@ AddPrinterDialog::AddPrinterDialog( Window* pParent )
 
 AddPrinterDialog::~AddPrinterDialog()
 {
-    if( m_pChooseDevicePage )
-        delete m_pChooseDevicePage;
-    if( m_pChooseDriverPage )
-        delete m_pChooseDriverPage;
-    if( m_pNamePage )
-        delete m_pNamePage;
-    if( m_pCommandPage )
-        delete m_pCommandPage;
-    if( m_pOldPrinterPage )
-        delete m_pOldPrinterPage;
-    if( m_pFaxDriverPage )
-        delete m_pFaxDriverPage;
-    if( m_pFaxSelectDriverPage )
-        delete m_pFaxSelectDriverPage;
-    if( m_pFaxCommandPage )
-        delete m_pFaxCommandPage;
-    if( m_pFaxNamePage )
-        delete m_pFaxNamePage;
-    if( m_pPdfDriverPage )
-        delete m_pPdfDriverPage;
-    if( m_pPdfSelectDriverPage )
-        delete m_pPdfSelectDriverPage;
-    if( m_pPdfNamePage )
-        delete m_pPdfNamePage;
-    if( m_pPdfCommandPage )
-        delete m_pPdfCommandPage;
+    delete m_pChooseDevicePage;
+    delete m_pChooseDriverPage;
+    delete m_pNamePage;
+    delete m_pCommandPage;
+    delete m_pFaxDriverPage;
+    delete m_pFaxSelectDriverPage;
+    delete m_pFaxCommandPage;
+    delete m_pFaxNamePage;
+    delete m_pPdfDriverPage;
+    delete m_pPdfSelectDriverPage;
+    delete m_pPdfNamePage;
+    delete m_pPdfCommandPage;
 }
 
 void AddPrinterDialog::updateSettings()
@@ -820,15 +610,6 @@ void AddPrinterDialog::advance()
             m_pCurrentPage = m_pChooseDriverPage;
             m_aPrevPB.Enable( true );
         }
-        else if( m_pChooseDevicePage->isOld() )
-        {
-            if( ! m_pOldPrinterPage )
-                m_pOldPrinterPage = new APOldPrinterPage( this );
-            m_pCurrentPage = m_pOldPrinterPage;
-            m_aPrevPB.Enable( true );
-            m_aFinishPB.Enable( true );
-            m_aNextPB.Enable( false );
-        }
         else if( m_pChooseDevicePage->isFax() )
         {
             if( ! m_pFaxDriverPage )
@@ -940,12 +721,6 @@ void AddPrinterDialog::back()
     {
         m_pCurrentPage = m_pChooseDriverPage;
     }
-    else if( m_pCurrentPage == m_pOldPrinterPage )
-    {
-        m_pCurrentPage = m_pChooseDevicePage;
-        m_aPrevPB.Enable( false );
-        m_aNextPB.Enable( true );
-    }
     else if( m_pCurrentPage == m_pFaxDriverPage )
     {
         m_pCurrentPage = m_pChooseDevicePage;
@@ -991,35 +766,30 @@ void AddPrinterDialog::back()
 void AddPrinterDialog::addPrinter()
 {
     PrinterInfoManager& rManager( PrinterInfoManager::get() );
-    if( ! m_pChooseDevicePage->isOld() )
+    m_aPrinter.m_aPrinterName = uniquePrinterName( m_aPrinter.m_aPrinterName );
+    if( rManager.addPrinter( m_aPrinter.m_aPrinterName, m_aPrinter.m_aDriverName ) )
     {
-        m_aPrinter.m_aPrinterName = uniquePrinterName( m_aPrinter.m_aPrinterName );
-        if( rManager.addPrinter( m_aPrinter.m_aPrinterName, m_aPrinter.m_aDriverName ) )
+        PrinterInfo aInfo( rManager.getPrinterInfo( m_aPrinter.m_aPrinterName ) );
+        aInfo.m_aCommand = m_aPrinter.m_aCommand;
+        if( m_pChooseDevicePage->isPrinter() )
         {
-            PrinterInfo aInfo( rManager.getPrinterInfo( m_aPrinter.m_aPrinterName ) );
-            aInfo.m_aCommand = m_aPrinter.m_aCommand;
-            if( m_pChooseDevicePage->isPrinter() )
-            {
-                if( m_pNamePage->isDefault() )
-                    rManager.setDefaultPrinter( m_aPrinter.m_aPrinterName );
-            }
-            else if( m_pChooseDevicePage->isFax() )
-            {
-                aInfo.m_aFeatures = "fax=";
-                if( m_pFaxNamePage->isFaxSwallow() )
-                    aInfo.m_aFeatures += "swallow";
-            }
-            else if( m_pChooseDevicePage->isPDF() )
-            {
-                OUString aPdf( "pdf=" );
-                aPdf += m_pPdfCommandPage->getPdfDir();
-                aInfo.m_aFeatures = aPdf;
-            }
-            rManager.changePrinterInfo( m_aPrinter.m_aPrinterName, aInfo );
+            if( m_pNamePage->isDefault() )
+                rManager.setDefaultPrinter( m_aPrinter.m_aPrinterName );
+        }
+        else if( m_pChooseDevicePage->isFax() )
+        {
+            aInfo.m_aFeatures = "fax=";
+            if( m_pFaxNamePage->isFaxSwallow() )
+                aInfo.m_aFeatures += "swallow";
+        }
+        else if( m_pChooseDevicePage->isPDF() )
+        {
+            OUString aPdf( "pdf=" );
+            aPdf += m_pPdfCommandPage->getPdfDir();
+            aInfo.m_aFeatures = aPdf;
         }
+        rManager.changePrinterInfo( m_aPrinter.m_aPrinterName, aInfo );
     }
-    else if( m_pOldPrinterPage )
-        m_pOldPrinterPage->addOldPrinters();
 }
 
 IMPL_LINK( AddPrinterDialog, ClickBtnHdl, PushButton*, pButton )
diff --git a/padmin/source/adddlg.hxx b/padmin/source/adddlg.hxx
index 15a9a57..129dbb5 100644
--- a/padmin/source/adddlg.hxx
+++ b/padmin/source/adddlg.hxx
@@ -56,7 +56,6 @@ class APChooseDevicePage : public APTabPage
     RadioButton             m_aPrinterBtn;
     RadioButton             m_aFaxBtn;
     RadioButton             m_aPDFBtn;
-    RadioButton             m_aOldBtn;
     FixedText               m_aOverTxt;
 public:
     APChooseDevicePage( AddPrinterDialog* pParent );
@@ -65,8 +64,6 @@ public:
     bool isPrinter() { return m_aPrinterBtn.IsChecked(); }
     bool isFax() { return m_aFaxBtn.IsChecked(); }
     bool isPDF() { return m_aPDFBtn.IsChecked(); }
-    bool isOld() { return m_aOldBtn.IsChecked(); }
-
 
     virtual bool check();
     virtual void fill( ::psp::PrinterInfo& rInfo );
@@ -206,7 +203,6 @@ class AddPrinterDialog : public ModalDialog
     APCommandPage*          m_pCommandPage;
     APChooseDriverPage*     m_pChooseDriverPage;
     APNamePage*             m_pNamePage;
-    APOldPrinterPage*       m_pOldPrinterPage;
     APFaxDriverPage*        m_pFaxDriverPage;
     APChooseDriverPage*     m_pFaxSelectDriverPage;
     APNamePage*             m_pFaxNamePage;
diff --git a/padmin/source/padialog.hrc b/padmin/source/padialog.hrc
index a0abb87..206c6d8 100644
--- a/padmin/source/padialog.hrc
+++ b/padmin/source/padialog.hrc
@@ -90,9 +90,6 @@
 #define RID_TXT_TESTPAGE_DATE                    1070
 #define RID_TXT_TESTPAGE_TIME                    1071
 #define RID_TXT_PRINTERALREADYEXISTS            1072
-#define RID_TXT_PRINTERWITHOUTCOMMAND            1073
-#define RID_TXT_PRINTERADDFAILED                1074
-#define RID_TXT_DRIVERDOESNOTEXIST               1075
 #define RID_TXT_TESTPAGE_COMMENT                1076
 #define RID_TXT_TESTPAGE_NAME                    1077
 
@@ -122,7 +119,6 @@
 #define RID_ADDP_CHDEV_BTN_PRINTER              2
 #define RID_ADDP_CHDEV_BTN_FAX                  3
 #define RID_ADDP_CHDEV_BTN_PDF                  4
-#define RID_ADDP_CHDEV_BTN_OLD                  5
 
 #define RID_ADDP_PAGE_CHOOSEDRIVER              2002
 #define RID_ADDP_CHDRV_TXT_DRIVER               1
@@ -152,11 +148,6 @@
 #define RID_ADDP_CMD_BTN_PDFDIR                 8
 #define RID_ADDP_CMD_BOX_PDFCOMMAND             9
 
-#define RID_ADDP_PAGE_OLDPRINTERS               2005
-#define RID_ADDP_OLD_TXT_PRINTERS               1
-#define RID_ADDP_OLD_BOX_PRINTERS               2
-#define RID_ADDP_OLD_BTN_SELECTALL              3
-
 #define RID_ADDP_PAGE_FAXDRIVER                 2006
 #define RID_ADDP_FAXDRV_TXT_DRIVER              1
 #define RID_ADDP_FAXDRV_BTN_DEFAULT             2
diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src
index 1293ccd..a175e3b 100644
--- a/padmin/source/padialog.src
+++ b/padmin/source/padialog.src
@@ -463,21 +463,6 @@ String RID_TXT_PRINTERALREADYEXISTS
     Text [ en-US ] = "A printer named \"%s\" already exists. This printer will not be imported.";
 };
 
-String RID_TXT_PRINTERWITHOUTCOMMAND
-{
-    Text [ en-US ] = "The printer \"%s\" has no valid configuration and, therefore, cannot be imported.";
-};
-
-String RID_TXT_DRIVERDOESNOTEXIST
-{
-    Text [ en-US ] = "The driver for the printer \"%s1\" (%s2) is not installed. Therefore the printer cannot be imported.";
-};
-
-String RID_TXT_PRINTERADDFAILED
-{
-    Text [ en-US ] = "The printer \"%s\" could not be added.";
-};
-
 ModalDialog RID_ADD_PRINTER_DIALOG
 {
     HelpID = "padmin:ModalDialog:RID_ADD_PRINTER_DIALOG";
@@ -606,13 +591,6 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV
         Size = MAP_APPFONT( 180, 10 );
         Text [ en-US ] = "Connect a P~DF converter";
     };
-    RadioButton RID_ADDP_CHDEV_BTN_OLD
-    {
-        HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_OLD";
-        Pos = MAP_APPFONT ( 40, 70 );
-        Size = MAP_APPFONT( 180, 10 );
-        Text [ en-US ] = "~Import printers from a StarOffice installation";
-    };
 };
 
 TabPage RID_ADDP_PAGE_NAME
@@ -750,39 +728,6 @@ TabPage RID_ADDP_PAGE_COMMAND
     };
 };
 
-TabPage RID_ADDP_PAGE_OLDPRINTERS
-{
-    HelpID = "padmin:TabPage:RID_ADDP_PAGE_OLDPRINTERS";
-    Hide = TRUE;
-    Pos = MAP_APPFONT( 0, 30 );
-    Size = MAP_APPFONT( 240, 120 );
-    String RID_ADDP_STR_TITLE
-    {
-        Text [ en-US ] = "Import printers from old versions";
-    };
-    FixedText RID_ADDP_OLD_TXT_PRINTERS
-    {
-        Pos = MAP_APPFONT( 10, 10 );
-        Size = MAP_APPFONT( 165, 25 );
-        WordBreak = TRUE;
-        Text [ en-US ] = "~These printers can be imported. Please select the ones you want to import.";
-    };
-    MultiListBox RID_ADDP_OLD_BOX_PRINTERS
-    {
-        HelpID = "padmin:MultiListBox:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BOX_PRINTERS";
-        Pos = MAP_APPFONT( 10, 35 );
-        Size = MAP_APPFONT( 165, 80 );
-        Border = TRUE;
-    };
-    PushButton RID_ADDP_OLD_BTN_SELECTALL
-    {
-        HelpID = "padmin:PushButton:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BTN_SELECTALL";
-        Pos = MAP_APPFONT( 180, 35 );
-        Size = MAP_APPFONT( 50, 12 );
-        Text [ en-US ] = "~Select All";
-    };
-};
-
 TabPage RID_ADDP_PAGE_FAXDRIVER
 {
     HelpID = "padmin:TabPage:RID_ADDP_PAGE_FAXDRIVER";
commit decfd4b09d3308ed2f487db648f9440fe74f0eb3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 7 16:27:39 2014 +0000

    this skeleton can go now
    
    Change-Id: Iae230af6c073d1522becdc540f2992a772557cef

diff --git a/cui/uiconfig/ui/customize.ui b/cui/uiconfig/ui/customize.ui
deleted file mode 100644
index 751faec..0000000
--- a/cui/uiconfig/ui/customize.ui
+++ /dev/null
@@ -1,1525 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
-<interface>
-  <requires lib="gtk+" version="3.0"/>
-  <object class="GtkDialog" id="Customize">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="ok">
-                <property name="label">gtk-ok</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">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="cancel">
-                <property name="label">gtk-cancel</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">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="help">
-                <property name="label">gtk-help</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">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="button6">
-                <property name="label" translatable="yes">_Reset</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkNotebook" id="notebook1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="margin_bottom">99</property>
-            <child>
-              <object class="GtkBox" id="box1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkFrame" id="frame1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkBox" id="box2">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="yalign">0</property>
-                                <property name="label" translatable="yes">_Menu</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBoxText" id="comboboxtext1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="box3">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkButton" id="new">
-                                    <property name="label" translatable="yes">_New...</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">True</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkExpander" id="expander1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <child>
-                                      <object class="GtkBox" id="box8">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="orientation">vertical</property>
-                                        <child>
-                                          <object class="GtkLabel" id="label13">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">_Move...</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label14">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">_Rename...</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSeparator" id="separator5">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label15">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">_Delete</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">3</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child type="label">
-                                      <object class="GtkLabel" id="label12">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Menu</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">%PRODUCTNAME Writer Menus</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="frame2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment2">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkBox" id="box4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkBox" id="box5">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="label8">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="yalign">0</property>
-                                    <property name="label" translatable="yes">_Entries</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow1">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="shadow_type">in</property>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="box9">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="orientation">vertical</property>
-                                    <property name="spacing">2</property>
-                                    <child>
-                                      <object class="GtkImage" id="up">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="stock">gtk-go-up</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkImage" id="down">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="stock">gtk-go-down</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="box6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="orientation">vertical</property>
-                                    <child>
-                                      <object class="GtkButton" id="add">
-                                        <property name="label" translatable="yes">_Add...</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkExpander" id="expander2">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <child>
-                                          <object class="GtkBox" id="box10">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="orientation">vertical</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label17">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">_Add Submenu...</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label18">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">_Begin a Group</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkSeparator" id="separator6">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">2</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label19">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">_Rename...</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">3</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkSeparator" id="separator7">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">4</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label20">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">_Delete</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">5</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child type="label">
-                                          <object class="GtkLabel" id="label16">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Modify</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="box7">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="label9">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">_Save In</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="combobox2">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Menu Content</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="frame3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkLabel" id="label10">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Description</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Menus</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="box16">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkFrame" id="frame6">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkBox" id="box21">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkLabel" id="label29">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">_Toolbars</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBoxText" id="comboboxtext2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="box22">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">vertical</property>
-                                <child>
-                                  <object class="GtkButton" id="ne">
-                                    <property name="label">gtk-new</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">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkExpander" id="expander3">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <child>
-                                      <object class="GtkBox" id="box29">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="orientation">vertical</property>
-                                        <child>
-                                          <object class="GtkLabel" id="label35">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">_Rename</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label36">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">_Delete</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSeparator" id="separator1">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label37">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Restore Default Settings</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">3</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSeparator" id="separator2">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">4</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label38">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">_Icons Only</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">5</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label39">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">_Text only</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">6</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label40">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">I_cons & Text</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">7</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                    </child>
-                                    <child type="label">
-                                      <object class="GtkLabel" id="label30">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Toolbar</property>
-                                      </object>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label26">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">%PRODUCTNAME Writer Toolbars</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="frame7">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkBox" id="box23">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkBox" id="box24">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="label31">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">Co_mmands</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="shadow_type">in</property>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="box25">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="orientation">vertical</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkImage" id="u">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="stock">gtk-go-up</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkImage" id="dow">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="stock">gtk-go-down</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="box26">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="orientation">vertical</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkButton" id="ad">
-                                        <property name="label">gtk-add</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">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkExpander" id="expander4">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <child>
-                                          <object class="GtkBox" id="box28">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="orientation">vertical</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label41">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">_Rename...</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label42">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">_Delete</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label43">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Restore Default _Command</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">2</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkSeparator" id="separator3">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">3</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label44">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">_Begin a Group</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">4</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkSeparator" id="separator4">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">5</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label45">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Change _Icon...</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">6</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label46">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">Re_set Icon</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">7</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child type="label">
-                                          <object class="GtkLabel" id="label32">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Modify</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">3</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkBox" id="box27">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="spacing">6</property>
-                                <child>
-                                  <object class="GtkLabel" id="label33">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="label" translatable="yes">_Save In</property>
-                                    <property name="use_underline">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBoxText" id="comboboxtext3">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label27">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Toolbar Content</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="frame8">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkAlignment" id="alignment8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <object class="GtkLabel" id="label34">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="label">
-                      <object class="GtkLabel" id="label28">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">_Description</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="label3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Toolbars</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <action-widgets>
-      <action-widget response="0">ok</action-widget>
-      <action-widget response="0">cancel</action-widget>
-      <action-widget response="0">help</action-widget>
-      <action-widget response="0">button6</action-widget>
-    </action-widgets>
-  </object>
-  <object class="GtkAction" id="action1"/>
-  <object class="GtkBox" id="box13">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkBox" id="box14">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkFrame" id="frame4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkAlignment" id="alignment4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="shadow_type">in</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label21">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Shortcut keys</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">10</property>
-            <child>
-              <object class="GtkBox" id="box17">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkBox" id="box18">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">4</property>
-                    <child>
-                      <object class="GtkRadioButton" id="radiobutton1">
-                        <property name="label" translatable="yes">Li_breOffice</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="radiobutton2">
-                        <property name="label" translatable="yes">_Writer</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list