[KBear-cvs] kbear/kbear/lib/interfaces kbearfilesyspartiface.cpp,1.38,1.39
Brought to you by:
kbjorn
Menu
▾
▴
[KBear-cvs] kbear/kbear/lib/interfaces kbearfilesyspartiface.cpp,1.38,1.39
|
From: <fri...@us...> - 2003-11-27 16:10:27
|
Update of /cvsroot/kbear/kbear/kbear/lib/interfaces
In directory sc8-pr-cvs1:/tmp/cvs-serv27687/kbear/lib/interfaces
Modified Files:
kbearfilesyspartiface.cpp
Log Message:
Renamed strings containing "directory" to "folder" for usability reasons.
Index: kbearfilesyspartiface.cpp
===================================================================
RCS file: /cvsroot/kbear/kbear/kbear/lib/interfaces/kbearfilesyspartiface.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** kbearfilesyspartiface.cpp 16 Jul 2003 00:03:07 -0000 1.38
--- kbearfilesyspartiface.cpp 27 Nov 2003 16:10:24 -0000 1.39
***************
*** 663,669 ****
void KBearFileSysPartInterface::init( const SiteInfo& info ) {
m_siteInfo = info;
! readProperties( kapp->config(), "View Settings" );
!
m_myWidget->init( m_siteInfo );
d->m_connectedTimer = new QTimer( this );
--- 663,669 ----
void KBearFileSysPartInterface::init( const SiteInfo& info ) {
m_siteInfo = info;
! kdDebug()<<"KBearFileSysPartInterface::init() " << m_siteInfo.fileSysEncoding() <<endl;
m_myWidget->init( m_siteInfo );
+ readProperties( kapp->config(), "View Settings" );
d->m_connectedTimer = new QTimer( this );
***************
*** 945,949 ****
// Create widgets, and display using geometry management
//
! lMakeDir = new KDialogBase( m_myWidget->fileView()->widget(), "MakeDir Dialog", true, i18n("New Directory"), KDialogBase::Ok | KDialogBase::Cancel );
vbox = new QVBox( lMakeDir );
vbox->setSpacing( KDialog::spacingHint() );
--- 945,949 ----
// Create widgets, and display using geometry management
//
! lMakeDir = new KDialogBase( m_myWidget->fileView()->widget(), "MakeDir Dialog", true, i18n("New Folder"), KDialogBase::Ok | KDialogBase::Cancel );
vbox = new QVBox( lMakeDir );
vbox->setSpacing( KDialog::spacingHint() );
***************
*** 951,959 ****
label = new QLabel( vbox );
label->setAlignment( AlignLeft | AlignVCenter );
! label->setText(i18n("Create new directory in: ") +
QString::fromLatin1( "\n" ) + /* don't break i18n now*/
m_url.prettyURL() );
ed= new KLineEdit( vbox );
! ed->setText( i18n("New Directory") );
ed->selectAll();
connect(ed, SIGNAL(returnPressed()), lMakeDir, SLOT(accept()) );
--- 951,959 ----
label = new QLabel( vbox );
label->setAlignment( AlignLeft | AlignVCenter );
! label->setText(i18n("Create new folder in: ") +
QString::fromLatin1( "\n" ) + /* don't break i18n now*/
m_url.prettyURL() );
ed= new KLineEdit( vbox );
! ed->setText( i18n("New Folder") );
ed->selectAll();
connect(ed, SIGNAL(returnPressed()), lMakeDir, SLOT(accept()) );
***************
*** 1012,1016 ****
new KAction( i18n("Properties..."), ALT+Key_Return, this, SLOT(slotProperties()), actionCollection(), "properties" );
! KAction* tmpAction = new KAction( i18n("New Directory..."), 0, this, SLOT( slotMakeDir() ), actionCollection(), "edit_mkdir" );
tmpAction->setIcon( QString::fromLatin1("folder_new") );
new KAction( i18n( "Rename" ), 0, Key_F2, m_myWidget, SLOT( slotRename() ), actionCollection(), "edit_rename" );
--- 1012,1016 ----
new KAction( i18n("Properties..."), ALT+Key_Return, this, SLOT(slotProperties()), actionCollection(), "properties" );
! KAction* tmpAction = new KAction( i18n("New Folder..."), 0, this, SLOT( slotMakeDir() ), actionCollection(), "edit_mkdir" );
tmpAction->setIcon( QString::fromLatin1("folder_new") );
new KAction( i18n( "Rename" ), 0, Key_F2, m_myWidget, SLOT( slotRename() ), actionCollection(), "edit_rename" );
***************
*** 1018,1029 ****
tmpAction = new KAction( i18n("S&top"),"stop", 0, this, SLOT( stop() ), actionCollection(), "view_stop" );
! tmpAction->setToolTip( i18n("Stop loading directory.") );
tmpAction = KStdAction::up( this, SLOT( cdUp() ), actionCollection(), KStdAction::name(KStdAction::Up) );
! tmpAction->setText( i18n("Parent Directory") );
KStdAction::back( this, SLOT( back() ), actionCollection(), KStdAction::name(KStdAction::Back) );
KStdAction::forward( this, SLOT(forward()), actionCollection(), KStdAction::name(KStdAction::Forward));
tmpAction = KStdAction::home( this, SLOT( home() ), actionCollection(), KStdAction::name(KStdAction::Home) );
! tmpAction->setText(i18n("Home Directory"));
tmpAction = KStdAction::redisplay( this, SLOT(reload()), actionCollection(), KStdAction::name(KStdAction::Redisplay) );
tmpAction->setText( i18n("Reload") );
--- 1018,1029 ----
tmpAction = new KAction( i18n("S&top"),"stop", 0, this, SLOT( stop() ), actionCollection(), "view_stop" );
! tmpAction->setToolTip( i18n("Stop loading folder.") );
tmpAction = KStdAction::up( this, SLOT( cdUp() ), actionCollection(), KStdAction::name(KStdAction::Up) );
! tmpAction->setText( i18n("Parent Folder") );
KStdAction::back( this, SLOT( back() ), actionCollection(), KStdAction::name(KStdAction::Back) );
KStdAction::forward( this, SLOT(forward()), actionCollection(), KStdAction::name(KStdAction::Forward));
tmpAction = KStdAction::home( this, SLOT( home() ), actionCollection(), KStdAction::name(KStdAction::Home) );
! tmpAction->setText(i18n("Home Folder"));
tmpAction = KStdAction::redisplay( this, SLOT(reload()), actionCollection(), KStdAction::name(KStdAction::Redisplay) );
tmpAction->setText( i18n("Reload") );
***************
*** 1046,1050 ****
KRadioAction* shortView = new KRadioAction( i18n("Short View"), "view_icon", 0, m_myWidget, SLOT( slotSimpleView() ), actionCollection(), "short_view" );
KRadioAction* detailedView = new KRadioAction( i18n("Detailed View"), "view_detailed", 0, m_myWidget, SLOT( slotDetailedView() ), actionCollection(), "detailed_view" );
! new KToggleAction( i18n("Directory &tree"), "view_tree",0, this, 0, actionCollection(), "tree_view" );
new KToggleAction( i18n("Show Hidden Files"), 0, actionCollection(), "show_hidden" );
--- 1046,1050 ----
KRadioAction* shortView = new KRadioAction( i18n("Short View"), "view_icon", 0, m_myWidget, SLOT( slotSimpleView() ), actionCollection(), "short_view" );
KRadioAction* detailedView = new KRadioAction( i18n("Detailed View"), "view_detailed", 0, m_myWidget, SLOT( slotDetailedView() ), actionCollection(), "detailed_view" );
! new KToggleAction( i18n("Folder &tree"), "view_tree",0, this, 0, actionCollection(), "tree_view" );
new KToggleAction( i18n("Show Hidden Files"), 0, actionCollection(), "show_hidden" );
***************
*** 1083,1098 ****
! action( KStdAction::name(KStdAction::Up) )->setWhatsThis( i18n("This button moves you up one step in the directory tree.") );
action( KStdAction::name(KStdAction::Back) )->setWhatsThis( i18n("This button moves you one step back in history list.") );
action( KStdAction::name(KStdAction::Forward) )->setWhatsThis( i18n("This button moves you one step forward in history list.") );
! action( KStdAction::name(KStdAction::Redisplay))->setWhatsThis( i18n("This button reloads current directory.") );
! action( "edit_mkdir" )->setWhatsThis( i18n("This button creates a new directory in current directory.") );
! action( "view_stop" )->setWhatsThis( i18n("This button stops loading the directory.") );
action( "detailed_view" )->setWhatsThis( i18n("This button change the view to detailed list mode.") );
action( "short_view" )->setWhatsThis( i18n("This button change the view to icon mode.") );
! action( KStdAction::name(KStdAction::Home) )->setWhatsThis( i18n("This button moves you to your home directory\n"
! "On a remote system this will be your startup directory.") );
! action( "tree_view" )->setToolTip( i18n("This button toggles the directory tree.") );
! action( "tree_view" )->setWhatsThis( i18n("This button toggles the directory tree.") );
action( KStdAction::name(KStdAction::Cut) )->setToolTip( i18n("Cut current selection from the active view into the clipboard.") );
action( KStdAction::name(KStdAction::Copy) )->setToolTip( i18n("Copy current selection from the active view into the clipboard.") );
--- 1083,1098 ----
! action( KStdAction::name(KStdAction::Up) )->setWhatsThis( i18n("This button moves you up one step in the folder tree.") );
action( KStdAction::name(KStdAction::Back) )->setWhatsThis( i18n("This button moves you one step back in history list.") );
action( KStdAction::name(KStdAction::Forward) )->setWhatsThis( i18n("This button moves you one step forward in history list.") );
! action( KStdAction::name(KStdAction::Redisplay))->setWhatsThis( i18n("This button reloads current folder.") );
! action( "edit_mkdir" )->setWhatsThis( i18n("This button creates a new folder in current folder.") );
! action( "view_stop" )->setWhatsThis( i18n("This button stops loading the folder.") );
action( "detailed_view" )->setWhatsThis( i18n("This button change the view to detailed list mode.") );
action( "short_view" )->setWhatsThis( i18n("This button change the view to icon mode.") );
! action( KStdAction::name(KStdAction::Home) )->setWhatsThis( i18n("This button moves you to your home folder\n"
! "On a remote system this will be your startup folder.") );
! action( "tree_view" )->setToolTip( i18n("This button toggles the folder tree.") );
! action( "tree_view" )->setWhatsThis( i18n("This button toggles the folder tree.") );
action( KStdAction::name(KStdAction::Cut) )->setToolTip( i18n("Cut current selection from the active view into the clipboard.") );
action( KStdAction::name(KStdAction::Copy) )->setToolTip( i18n("Copy current selection from the active view into the clipboard.") );
***************
*** 1119,1122 ****
--- 1119,1123 ----
return;
+ kdDebug()<<"KBearFileSysPartInterface::readProperties()"<<endl;
m_myWidget->readConfig( config, group );
|
