Commits

Anonymous committed e7d8df3

#i115372# - Some more size/position tweaks.

Comments (0)

Files changed (3)

fpicker/source/office/iodlg.cxx

     // Zahl der Pixel bestimmen, um die die anderen Elemente in der Position
     // Angepasst werden muessen.
     aPos.Y() += aToolbarButtonSize.Height();
-    aPos.Y() += LogicToPixel( Size( 0, 6 ), MAP_APPFONT ).Height();
+    aPos.Y() += LogicToPixel( Size( 0, 4 ), MAP_APPFONT ).Height();
     long nYOffset = aPos.Y();
     aPos = aFileViewPos;
     nYOffset -= aPos.Y();

fpicker/source/office/iodlg.src

     Size = MAP_APPFONT ( 280 , 234 ) ;
     FixedText FT_EXPLORERFILE_CURRENTPATH
     {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
+        Pos = MAP_APPFONT ( 6 , 7 ) ;
         Size = MAP_APPFONT ( 100 , 10 ) ;
         NoLabel = TRUE ;
     };
     };
     String STR_EXPLORERFILE_SAVE
     {
-        Text [ en-US ] = "Save as" ;
+        Text [ en-US ] = "Save As" ;
     };
     String STR_EXPLORERFILE_BUTTONSAVE
     {

svtools/source/contnr/fileview.cxx

 #define ALL_FILES_FILTER    "*.*"
 
 #define COLUMN_TITLE        1
-#define COLUMN_TYPE         2
-#define COLUMN_SIZE         3
-#define COLUMN_DATE         4
+#define COLUMN_DATE         2
+#define COLUMN_TYPE         3
+#define COLUMN_SIZE         4
 
 DECLARE_LIST( StringList_Impl, OUString* )
 
     if ( ( nFlags & FILEVIEW_SHOW_ALL ) == FILEVIEW_SHOW_ALL )
     {
         mpHeaderBar->InsertItem( COLUMN_TITLE, String( SvtResId( STR_SVT_FILEVIEW_COLUMN_TITLE ) ), 180, nBits | HIB_UPARROW );
+        mpHeaderBar->InsertItem( COLUMN_DATE, String( SvtResId( STR_SVT_FILEVIEW_COLUMN_DATE ) ), 160, nBits );
         mpHeaderBar->InsertItem( COLUMN_TYPE, String( SvtResId( STR_SVT_FILEVIEW_COLUMN_TYPE ) ), 140, nBits );
-        mpHeaderBar->InsertItem( COLUMN_SIZE, String( SvtResId( STR_SVT_FILEVIEW_COLUMN_SIZE ) ), 80, nBits );
-        mpHeaderBar->InsertItem( COLUMN_DATE, String( SvtResId( STR_SVT_FILEVIEW_COLUMN_DATE ) ), 500, nBits );
+        mpHeaderBar->InsertItem( COLUMN_SIZE, String( SvtResId( STR_SVT_FILEVIEW_COLUMN_SIZE ) ), 100, nBits );
     }
     else
-        mpHeaderBar->InsertItem( COLUMN_TITLE, String( SvtResId( STR_SVT_FILEVIEW_COLUMN_TITLE ) ), 600, nBits );
+        mpHeaderBar->InsertItem( COLUMN_TITLE, String( SvtResId( STR_SVT_FILEVIEW_COLUMN_TITLE ) ), 580, nBits );
 
     Size aHeadSize = mpHeaderBar->GetSizePixel();
     SetPosSizePixel( Point( 0, aHeadSize.Height() ),
     mpImp = new SvtFileView_Impl( this, xCmdEnv, nFlags, bOnlyFolder );
     mpImp->mpView->ForbidEmptyText();
 
-    long pTabs[] = { 5, 20, 180, 320, 400, 600 };
+    long pTabs[] = { 5, 20, 180, 340, 480, 580 };
     mpImp->mpView->SetTabs( &pTabs[0], MAP_PIXEL );
-    mpImp->mpView->SetTabJustify( 2, AdjustRight ); // column "Size"
+    mpImp->mpView->SetTabJustify( 3, AdjustRight ); // column "Size"
 
     if ( bMultiSelection )
         mpImp->mpView->SetSelectionMode( MULTIPLE_SELECTION );
 
     if ( ( nFlags & FILEVIEW_SHOW_ALL ) == FILEVIEW_SHOW_ALL )
     {
-        long pTabs[] = { 5, 20, 180, 320, 400, 600 };
+        long pTabs[] = { 5, 20, 180, 340, 480, 580 };
         mpImp->mpView->SetTabs( &pTabs[0], MAP_PIXEL );
-        mpImp->mpView->SetTabJustify( 2, AdjustRight ); // column "Size"
+        mpImp->mpView->SetTabJustify( 3, AdjustRight ); // column "Size"
     }
     else
     {
         // show only title
-        long pTabs[] = { 2, 20, 600 };
+        long pTabs[] = { 2, 20, 580 };
         mpImp->mpView->SetTabs( &pTabs[0], MAP_PIXEL );
     }
 
     {
         String aRow( pFileProperties[i] );
         // extract columns
-        // the columns are: title, type, size, date, target url, is folder, image url
+        // the columns are: title, date, type, size, target url, is folder, image url
         String aTitle, aType, aSize, aDate, aURL, aImageURL;
         xub_StrLen nIdx = 0;
         aTitle = aRow.GetToken( 0, '\t', nIdx );
+        aDate = aRow.GetToken( 0, '\t', nIdx );
         aType = aRow.GetToken( 0, '\t', nIdx );
         aSize = aRow.GetToken( 0, '\t', nIdx );
-        aDate = aRow.GetToken( 0, '\t', nIdx );
         aURL = aRow.GetToken( 0, '\t', nIdx );
         sal_Unicode cFolder = aRow.GetToken( 0, '\t', nIdx ).GetChar(0);
         sal_Bool bIsFolder = ( '1' == cFolder );
         // build new row
         String aNewRow = aTitle;
         aNewRow += '\t';
+        aNewRow += aDate;
+        aNewRow += '\t';
         aNewRow += aType;
         aNewRow += '\t';
         aNewRow += aSize;
-        aNewRow += '\t';
-        aNewRow += aDate;
         // detect image
         sal_Bool bDoInsert = sal_True;
         INetURLObject aObj( aImageURL.Len() > 0 ? aImageURL : aURL );
 
 void SvtFileView::SetHelpId( const rtl::OString& rHelpId )
 {
-	mpImp->mpView->SetHelpId( rHelpId );
+    mpImp->mpView->SetHelpId( rHelpId );
 }
 
 // -----------------------------------------------------------------------
 
     for ( aIt = maContent.begin(); aIt != maContent.end(); aIt++ )
     {
-        // title, type, size, date
+        // title, date, type, size
         aValue = (*aIt)->GetTitle();
         // #83004# --------------------
         ReplaceTabWithString( aValue );
         aValue += aTab;
-        aValue += (*aIt)->maType;
-        aValue += aTab;
-        // folders don't have a size
-        if ( ! (*aIt)->mbIsFolder )
-            aValue += CreateExactSizeText_Impl( (*aIt)->maSize );
-        aValue += aTab;
         // set the date, but volumes have no date
         if ( ! (*aIt)->mbIsFolder || ! (*aIt)->mbIsVolume )
         {
             aValue += aDateSep;
             aValue += rLocaleData.getTime( (*aIt)->maModDate );
         }
+        aValue += aTab;
+        aValue += (*aIt)->maType;
+        aValue += aTab;
+        // folders don't have a size
+        if ( ! (*aIt)->mbIsFolder )
+            aValue += CreateExactSizeText_Impl( (*aIt)->maSize );
         (*aIt)->maDisplayText = aValue;
 
         // detect image
 // -----------------------------------------------------------------------
 // this function converts the sequence of strings into a vector of SortingData
 // the string should have the form :
-// title \t type \t size \t date \t target url \t is folder \t image url
+// title \t date \t type \t size \t target url \t is folder \t image url
 
 void SvtFileView_Impl::CreateVector_Impl( const Sequence < OUString > &rList )
 {
         ReplaceTabWithString( aDisplayText );
         aDisplayText += aTab;
 
+        // get the date
+        if ( nIndex >= 0 )
+        {
+            OUString aDate = aValue.getToken( 0, '\t', nIndex );
+            aDisplayText += aDate;
+
+            if ( aDate.getLength() )
+            {
+                DBG_ERRORFILE( "Don't know, how to convert date" );
+                ;// convert date string to date
+            }
+        }
+        aDisplayText += aTab;
+
         // get the type
         if ( nIndex >= 0 )
         {
             if ( aSize.getLength() )
                 pEntry->maSize = aSize.toInt64();
         }
-        aDisplayText += aTab;
-
-        // get the date
-        if ( nIndex >= 0 )
-        {
-            OUString aDate = aValue.getToken( 0, '\t', nIndex );
-            aDisplayText += aDate;
-
-            if ( aDate.getLength() )
-            {
-                DBG_ERRORFILE( "Don't know, how to convert date" );
-                ;// convert date string to date
-            }
-        }
+
         // get the target url
         if ( nIndex >= 0 )
         {
             pEntry->maTargetURL = aValue.getToken( 0, '\t', nIndex );
         }
+
         // get the size
         if ( nIndex >= 0 )
         {
             if ( aBool.getLength() )
                 pEntry->mbIsFolder = aBool.toBoolean();
         }
+
         // get the image url
         if ( nIndex >= 0 )
         {
     // #83004# --------------------
     ReplaceTabWithString( aValue );
     aValue += aTab;
-    aValue += pData->maType;
-    aValue += aTab;
-    // folders don't have a size
-    aValue += aTab;
     // set the date
     SvtSysLocale aSysLocale;
     const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
     aValue += rLocaleData.getDate( pData->maModDate );
     aValue += aDateSep;
     aValue += rLocaleData.getTime( pData->maModDate );
+    aValue += aTab;
+    aValue += pData->maType;
+    aValue += aTab;
+    // folders don't have a size
 
     pData->maDisplayText = aValue;
     maContent.push_back( pData );
 }
 
 }
-