summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp6
-rw-r--r--korganizer/kofilterview.cpp6
-rw-r--r--korganizer/kotodoview.cpp18
-rw-r--r--korganizer/mainwindow.cpp19
-rw-r--r--microkde/kglobal.cpp7
5 files changed, 26 insertions, 30 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index eac2f29..d25f632 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -4026,7 +4026,11 @@ void CalendarView::editFilters()
}
void CalendarView::toggleFilter()
{
- showFilter(! mCalEditView->isVisible());
+ if ( mLeftFrame->isHidden() ) {
+ toggleExpand();
+ showFilter( true );
+ } else
+ showFilter(! mCalEditView->isVisible());
}
KOFilterView *CalendarView::filterView()
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index e4dc751..bb88386 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -195,7 +195,7 @@ void KOCalEditView::deleteCal( int id )
{
KopiCalendarFile * kkf = KOPrefs::instance()->getCalendar( id );
QString name = kkf->mName;
- QString file = kkf->mFileName;
+ QString file = KGlobal::formatMessage ( kkf->mFileName ,0 );
if ( KMessageBox::warningContinueCancel( this, i18n("The calendar <b>%1</b> is displaying file <b>%2</b>. Do you want to remove this calendar from KO/Pi? (The file is not removed!)").arg(name).arg(file) ) != KMessageBox::Continue ) return;
if ( kkf->isStandard )
selectStdCal( 1, true );
@@ -207,7 +207,7 @@ void KOCalEditView::deleteCal( int id )
void KOCalEditView::infoCal( int id )
{
QString name = KOPrefs::instance()->getCalendar( id )->mName;
- QString file = KOPrefs::instance()->getCalendar( id )->mFileName;
+ QString file = KGlobal::formatMessage ( KOPrefs::instance()->getCalendar( id )->mFileName, 0 );
if ( KOPrefs::instance()->getCalendar( id )->mErrorOnLoad ) {
if ( KMessageBox::Yes == KMessageBox::questionYesNo( this, i18n("The calendar <b>%1</b> is not loaded! Loading of file <b>%2</b> failed! <b>Try again to load the calendar?</b>").arg(name).arg(file) ) ) {
emit calendarAdded( id );
@@ -360,7 +360,7 @@ void KOCalEditView::addCal()
break;
}
if ( kkf->mFileName == file ) {
- KMessageBox::information( this, i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg( file) );
+ KMessageBox::information( this, i18n("Sorry, the file \n%1\nis already loaded!\nPlease choose another file!").arg( KGlobal::formatMessage (file, 0 )) );
tryagain = true;
file = "";
break;
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 13e88ef..926a136 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -96,6 +96,7 @@ KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name
ete->setTime( QTime::currentTime() );
QPushButton * ok = new QPushButton( i18n("Stop and save"), this );
lay->addWidget( ok );
+ ok->setDefault( true );
QPushButton * cancel = new QPushButton( i18n("Continue running"), this );
lay->addWidget( cancel );
connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) );
@@ -1202,26 +1203,9 @@ void KOTodoView::toggleRunningItem()
return;
Todo * t = mActiveItem->todo();
if ( t->isRunning() ) {
-
-
KOStopTodoPrefs tp ( t, this );
tp.exec();
-
-
-#if 0
- int result = KMessageBox::warningYesNoCancel(this,
- i18n("The todo\n%1\nis started.\nDo you want to set\nthe state to stopped?").arg(mActiveItem->text(0).left( 25 ) ),i18n("Todo is started"),i18n("Stop"),i18n("Stop+note"));
- if (result == KMessageBox::Cancel) return;
- if ( result == KMessageBox::No ) {
- QString comment = QInputDialog::getText(mActiveItem->text(0).left( 25 ),i18n("Comment for todo:") );
- t->setRunningFalse( comment );
- } else {
- t->setRunning( false );
- }
mActiveItem->construct();
-
-
-#endif
} else {
int result = KMessageBox::warningContinueCancel(this,
i18n("<center>%1</center> <center>is not running. Do you want to set\nthe state to running?</center>").arg(mActiveItem->text(0).left( 25 ) ),i18n("Start todo"),i18n("Start todo"),i18n("Cancel"), true);
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 13e186d..f945383 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -778,13 +778,7 @@ void MainWindow::initActions()
FSaction->addTo( viewMenu );
connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
- icon = loadPixmap( pathString + "navi" );
- configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
- action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
- action->addTo( viewMenu );
- connect( action, SIGNAL( activated() ),
- mView, SLOT( toggleDateNavigatorWidget() ) );
- mToggleNav = action ;
+
icon = loadPixmap( pathString + "filter" );
configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
icon = loadPixmap( pathString + "configure" );
@@ -793,6 +787,13 @@ void MainWindow::initActions()
connect( action, SIGNAL( activated() ),
mView, SLOT( toggleFilter() ) );
mToggleFilter = action;
+ icon = loadPixmap( pathString + "navi" );
+ configureToolBarMenu->insertItem(icon, i18n("Toggle DateNavigator"), 22 );
+ action = new QAction( i18n("Toggle DateNavigator"), icon, i18n("Toggle DateNavigator"), 0, this );
+ action->addTo( viewMenu );
+ connect( action, SIGNAL( activated() ),
+ mView, SLOT( toggleDateNavigatorWidget() ) );
+ mToggleNav = action ;
icon = loadPixmap( pathString + "allday" );
configureToolBarMenu->insertItem(icon, i18n("Toggle Allday"), 24 );
action = new QAction( i18n("Toggle Allday"), icon,i18n("Toggle Allday"), 0, this );
@@ -804,8 +805,8 @@ void MainWindow::initActions()
connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
mToggleNav, SLOT( setEnabled ( bool ) ) );
- connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
- mToggleFilter, SLOT( setEnabled ( bool ) ) );
+ //connect( mView->viewManager(), SIGNAL( signalFullScreen( bool ) ),
+ // mToggleFilter, SLOT( setEnabled ( bool ) ) );
connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
mToggleAllday, SLOT( setEnabled ( bool ) ) );
// connect( mView->viewManager(), SIGNAL( signalAgendaView( bool ) ),
diff --git a/microkde/kglobal.cpp b/microkde/kglobal.cpp
index bf7e238..53edd08 100644
--- a/microkde/kglobal.cpp
+++ b/microkde/kglobal.cpp
@@ -99,6 +99,13 @@ QString KGlobal::getAppName()
QString KGlobal::formatMessage ( QString mess, int maxlen )
{
//int maxlen = 80;
+ if ( maxlen == 0 ) {
+ maxlen = QApplication::desktop()->width()/10;
+ if ( maxlen > 32 )
+ maxlen = (maxlen * 3) / 4;
+ if ( maxlen > 100 )
+ maxlen = 100;
+ }
int start = 0;
int end = mess.length();
QString retVal = "";