From: Dirk E. <des...@us...> - 2005-09-15 18:58:50
|
Update of /cvsroot/krusader/krusader_kde3/krusader/Synchronizer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18653/krusader/Synchronizer Modified Files: synchronizergui.cpp Log Message: Switched to qwhatsthis and updated several i18n's on the way Index: synchronizergui.cpp =================================================================== RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** synchronizergui.cpp 9 May 2005 17:47:56 -0000 1.43 --- synchronizergui.cpp 15 Sep 2005 18:58:38 -0000 1.44 *************** *** 49,53 **** #include <kio/netaccess.h> #include <qeventloop.h> ! #include <qtooltip.h> #include <qregexp.h> #include <qheader.h> --- 49,53 ---- #include <kio/netaccess.h> #include <qeventloop.h> ! #include <qwhatsthis.h> #include <qregexp.h> #include <qheader.h> *************** *** 1075,1079 **** leftUrlReq->setMinimumWidth( 250 ); grid->addWidget( leftUrlReq, 1 ,0 ); ! QToolTip::add( leftLocation, i18n( "The left base directory" ) ); leftUrlReq->setEnabled( !hasSelectedFiles ); leftLocation->setEnabled( !hasSelectedFiles ); --- 1075,1079 ---- leftUrlReq->setMinimumWidth( 250 ); grid->addWidget( leftUrlReq, 1 ,0 ); ! QWhatsThis::add( leftLocation, i18n( "The left base directory used during the synchronisation process." ) ); leftUrlReq->setEnabled( !hasSelectedFiles ); leftLocation->setEnabled( !hasSelectedFiles ); *************** *** 1089,1096 **** fileFilter->setEditText("*"); grid->addWidget( fileFilter, 1 ,1 ); ! QToolTip::add( fileFilter, i18n( "Here you enter the filename filtering criteria. You can use wildcards\n" ! "(*.o .* *.c?? etc.), and give more items separated by space.\n" ! "If you type 'text' that results the same as '*text*'. You can exclude\n" ! "patterns from the search with '|' (e.g. '*.cpp *.h | *.moc.cpp' )." ) ); rightLocation = new KHistoryCombo(compareDirs, "SynchronizerHistoryRight"); --- 1089,1096 ---- fileFilter->setEditText("*"); grid->addWidget( fileFilter, 1 ,1 ); ! ! QString wtFilter = "<img src='toolbar|find'><p>" + i18n("The filename filtering criteria is defined here.<p>You can make use of wildcards. Multiple patterns are separated by space and patterns are excluded from the search using the pipe symbol.<p>Examples:<ul><code><li>*.o</li><li>*.h *.c\?\?</li><li>*.cpp *.h | *.moc.cpp</li></code></ul><b>Note</b>: the search term '<code>text</code>' is equivalent to '<code>*text*</code>'."); ! QWhatsThis::add(fileFilter, wtFilter); ! QWhatsThis::add(filterLabel, wtFilter); rightLocation = new KHistoryCombo(compareDirs, "SynchronizerHistoryRight"); *************** *** 1106,1110 **** rightUrlReq->setMinimumWidth( 250 ); grid->addWidget( rightUrlReq, 1 ,2 ); ! QToolTip::add( rightLocation, i18n( "The right base directory" ) ); rightUrlReq->setEnabled( !hasSelectedFiles ); rightLocation->setEnabled( !hasSelectedFiles ); --- 1106,1110 ---- rightUrlReq->setMinimumWidth( 250 ); grid->addWidget( rightUrlReq, 1 ,2 ); ! QWhatsThis::add( rightLocation, i18n( "The right base directory used during the synchronisation process." ) ); rightUrlReq->setEnabled( !hasSelectedFiles ); rightLocation->setEnabled( !hasSelectedFiles ); *************** *** 1114,1136 **** cbSubdirs = new QCheckBox( i18n( "Recurse subdirectories" ), optionGrid, "cbSubdirs" ); cbSubdirs->setChecked( krConfig->readBoolEntry( "Recurse Subdirectories", _RecurseSubdirs ) ); ! QToolTip::add( cbSubdirs, i18n( "Compares not only the base directories but their subdirectories as well" ) ); cbSymlinks = new QCheckBox( i18n( "Follow symlinks" ), optionGrid, "cbSymlinks" ); cbSymlinks->setChecked( krConfig->readBoolEntry( "Follow Symlinks", _FollowSymlinks ) ); cbSymlinks->setEnabled( cbSubdirs->isChecked() ); ! QToolTip::add( cbSymlinks, i18n( "Follows the symbolic links also at comparing" ) ); cbByContent = new QCheckBox( i18n( "Compare by content" ), optionGrid, "cbByContent" ); cbByContent->setChecked( krConfig->readBoolEntry( "Compare By Content", _CompareByContent ) ); ! QToolTip::add( cbByContent, i18n( "Compares duplicated files with same size, by their content" ) ); cbIgnoreDate = new QCheckBox( i18n( "Ignore Date" ), optionGrid, "cbIgnoreDate" ); cbIgnoreDate->setChecked( krConfig->readBoolEntry( "Ignore Date", _IgnoreDate ) ); ! QToolTip::add( cbIgnoreDate, i18n( "Ignores the date information at comparing (good if the files\nwere fetched from ftp, smb, archive, ... file systems)" ) ); cbAsymmetric = new QCheckBox( i18n( "Asymmetric" ), optionGrid, "cbAsymmetric" ); cbAsymmetric->setChecked( krConfig->readBoolEntry( "Asymmetric", _Asymmetric ) ); ! QToolTip::add( cbAsymmetric, i18n( "Asymmetric mode: the left side is the destination, the right is the source directory.\n" ! "Files existing only in the left directory will be deleted, the other differing ones\n" ! "will be copied from right to left (useful at updating a directory from a file server)." ) ); cbIgnoreCase = new QCheckBox( i18n( "Ignore Case" ), optionGrid, "cbIgnoreCase" ); cbIgnoreCase->setChecked( krConfig->readBoolEntry( "Ignore Case", _IgnoreCase ) ); ! QToolTip::add( cbIgnoreCase, i18n( "Case insensitive filename compare. Use at synchronizing on Windows filesystems." ) ); /* =========================== Show options groupbox ============================= */ --- 1114,1134 ---- cbSubdirs = new QCheckBox( i18n( "Recurse subdirectories" ), optionGrid, "cbSubdirs" ); cbSubdirs->setChecked( krConfig->readBoolEntry( "Recurse Subdirectories", _RecurseSubdirs ) ); ! QWhatsThis::add( cbSubdirs, i18n( "Compare not only the base directories but their subdirectories as well." ) ); cbSymlinks = new QCheckBox( i18n( "Follow symlinks" ), optionGrid, "cbSymlinks" ); cbSymlinks->setChecked( krConfig->readBoolEntry( "Follow Symlinks", _FollowSymlinks ) ); cbSymlinks->setEnabled( cbSubdirs->isChecked() ); ! QWhatsThis::add( cbSymlinks, i18n( "Follow symbolic links during the compare process." ) ); cbByContent = new QCheckBox( i18n( "Compare by content" ), optionGrid, "cbByContent" ); cbByContent->setChecked( krConfig->readBoolEntry( "Compare By Content", _CompareByContent ) ); ! QWhatsThis::add( cbByContent, i18n( "Compare duplicated files with same size by content." ) ); cbIgnoreDate = new QCheckBox( i18n( "Ignore Date" ), optionGrid, "cbIgnoreDate" ); cbIgnoreDate->setChecked( krConfig->readBoolEntry( "Ignore Date", _IgnoreDate ) ); ! QWhatsThis::add( cbIgnoreDate, i18n( "Ignore date information during the compare process.<p><b>Note</b>: useful if the files are located on network filesystems or in archives." ) ); cbAsymmetric = new QCheckBox( i18n( "Asymmetric" ), optionGrid, "cbAsymmetric" ); cbAsymmetric->setChecked( krConfig->readBoolEntry( "Asymmetric", _Asymmetric ) ); ! QWhatsThis::add( cbAsymmetric, i18n( "<b>Asymmetric mode</b><p>The left side is the destination, the right is the source directory. Files existing only in the left directory will be deleted, the other differing ones will be copied from right to left.<p><b>Note</b>: useful when updating a directory from a file server." ) ); cbIgnoreCase = new QCheckBox( i18n( "Ignore Case" ), optionGrid, "cbIgnoreCase" ); cbIgnoreCase->setChecked( krConfig->readBoolEntry( "Ignore Case", _IgnoreCase ) ); ! QWhatsThis::add( cbIgnoreCase, i18n( "Case insensitive filename compare.<p><b>Note</b>: useful when synchronizing Windows filesystems." ) ); /* =========================== Show options groupbox ============================= */ *************** *** 1157,1161 **** btnLeftToRight->setToggleButton( true ); btnLeftToRight->setOn( krConfig->readBoolEntry( "LeftToRight Button", _BtnLeftToRight ) ); ! QToolTip::add( btnLeftToRight, i18n( "Lists the files marked to copy from left to right" ) ); showOptionsLayout->addWidget( btnLeftToRight, 0, 0); --- 1155,1159 ---- btnLeftToRight->setToggleButton( true ); btnLeftToRight->setOn( krConfig->readBoolEntry( "LeftToRight Button", _BtnLeftToRight ) ); ! QWhatsThis::add( btnLeftToRight, i18n( "Show files marked to <i>Copy from left to right</i>." ) ); showOptionsLayout->addWidget( btnLeftToRight, 0, 0); *************** *** 1165,1169 **** btnEquals->setToggleButton( true ); btnEquals->setOn( krConfig->readBoolEntry( "Equals Button", _BtnEquals ) ); ! QToolTip::add( btnEquals, i18n( "Lists the files considered to be identical" ) ); showOptionsLayout->addWidget( btnEquals, 0, 1); --- 1163,1167 ---- btnEquals->setToggleButton( true ); btnEquals->setOn( krConfig->readBoolEntry( "Equals Button", _BtnEquals ) ); ! QWhatsThis::add( btnEquals, i18n( "Show files considered to be identical." ) ); showOptionsLayout->addWidget( btnEquals, 0, 1); *************** *** 1173,1177 **** btnDifferents->setToggleButton( true ); btnDifferents->setOn( krConfig->readBoolEntry( "Differents Button", _BtnDifferents ) ); ! QToolTip::add( btnDifferents, i18n( "Lists the excluded files" ) ); showOptionsLayout->addWidget( btnDifferents, 0, 2); --- 1171,1175 ---- btnDifferents->setToggleButton( true ); btnDifferents->setOn( krConfig->readBoolEntry( "Differents Button", _BtnDifferents ) ); ! QWhatsThis::add( btnDifferents, i18n( "Show excluded files." ) ); showOptionsLayout->addWidget( btnDifferents, 0, 2); *************** *** 1181,1185 **** btnRightToLeft->setToggleButton( true ); btnRightToLeft->setOn( krConfig->readBoolEntry( "RightToLeft Button", _BtnRightToLeft ) ); ! QToolTip::add( btnRightToLeft, i18n( "Lists the files marked to copy from right to left" ) ); showOptionsLayout->addWidget( btnRightToLeft, 0, 3); --- 1179,1183 ---- btnRightToLeft->setToggleButton( true ); btnRightToLeft->setOn( krConfig->readBoolEntry( "RightToLeft Button", _BtnRightToLeft ) ); ! QWhatsThis::add( btnRightToLeft, i18n( "Show files marked to <i>Copy from right to left</i>" ) ); showOptionsLayout->addWidget( btnRightToLeft, 0, 3); *************** *** 1189,1193 **** btnDeletable->setToggleButton( true ); btnDeletable->setOn( krConfig->readBoolEntry( "Deletable Button", _BtnDeletable ) ); ! QToolTip::add( btnDeletable, i18n( "Lists the files marked to delete" ) ); showOptionsLayout->addWidget( btnDeletable, 0, 4); --- 1187,1191 ---- btnDeletable->setToggleButton( true ); btnDeletable->setOn( krConfig->readBoolEntry( "Deletable Button", _BtnDeletable ) ); ! QWhatsThis::add( btnDeletable, i18n( "Show files marked to delete." ) ); showOptionsLayout->addWidget( btnDeletable, 0, 4); *************** *** 1197,1201 **** btnDuplicates->setToggleButton( true ); btnDuplicates->setOn( krConfig->readBoolEntry( "Duplicates Button", _BtnDuplicates ) ); ! QToolTip::add( btnDuplicates, i18n( "Lists those files that exist in both side" ) ); showOptionsLayout->addWidget( btnDuplicates, 0, 5); --- 1195,1199 ---- btnDuplicates->setToggleButton( true ); btnDuplicates->setOn( krConfig->readBoolEntry( "Duplicates Button", _BtnDuplicates ) ); ! QWhatsThis::add( btnDuplicates, i18n( "Show files that exist on both sides." ) ); showOptionsLayout->addWidget( btnDuplicates, 0, 5); *************** *** 1205,1209 **** btnSingles->setToggleButton( true ); btnSingles->setOn( krConfig->readBoolEntry( "Singles Button", _BtnSingles ) ); ! QToolTip::add( btnSingles, i18n( "Lists those files that exist only in either side" ) ); showOptionsLayout->addWidget( btnSingles, 0, 6); --- 1203,1207 ---- btnSingles->setToggleButton( true ); btnSingles->setOn( krConfig->readBoolEntry( "Singles Button", _BtnSingles ) ); ! QWhatsThis::add( btnSingles, i18n( "Show files that exist on one side only." ) ); showOptionsLayout->addWidget( btnSingles, 0, 6); *************** *** 1285,1289 **** btnSwapSides = new QPushButton( this, "btnSwapSides" ); btnSwapSides->setPixmap( swapSides ); ! QToolTip::add( btnSwapSides, i18n( "Swap sides" ) ); buttons->addWidget( btnSwapSides ); --- 1283,1287 ---- btnSwapSides = new QPushButton( this, "btnSwapSides" ); btnSwapSides->setPixmap( swapSides ); ! QWhatsThis::add( btnSwapSides, i18n( "Swap sides." ) ); buttons->addWidget( btnSwapSides ); |