summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-10 13:54:08 (UTC)
committer zautrix <zautrix>2005-06-10 13:54:08 (UTC)
commit31fed261955dcb25d06052a8154ac4cc630b0f7d (patch) (side-by-side diff)
treeef2b4fe35255f9bf387407b6756c112a67088ad6
parentd2f00fc2034450bc9a3cd1d2c3510bef1758d3bc (diff)
downloadkdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.zip
kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.tar.gz
kdepimpi-31fed261955dcb25d06052a8154ac4cc630b0f7d.tar.bz2
fixxx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/kodialogmanager.cpp3
-rw-r--r--korganizer/koeditordetails.cpp2
-rw-r--r--korganizer/koeditorgeneral.cpp2
-rw-r--r--korganizer/koprefsdialog.cpp50
-rw-r--r--korganizer/mainwindow.cpp2
-rw-r--r--korganizer/searchdialog.cpp23
-rw-r--r--korganizer/searchdialog.h3
-rw-r--r--libkdepim/kcmconfigs/kdepimconfigwidget.cpp91
-rw-r--r--microkde/kcolorbutton.cpp2
9 files changed, 131 insertions, 47 deletions
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 3dfa344..5455098 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -104,7 +104,8 @@ void KODialogManager::showOptionsDialog( bool showSync )
mMainView,SLOT(updateConfig()));
}
mOptionsDialog->readConfig();
-#ifndef DESKTOP_VERSION
+#ifndef DESKTOP_VERSION
+ mOptionsDialog->hideButtons();
mOptionsDialog->showMaximized();
#else
mOptionsDialog->show();
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index bdfc637..6ecf978 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -87,7 +87,7 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
mListView->addColumn(i18n("Role"),60);
mListView->addColumn(i18n("Status"),100);
mListView->addColumn(i18n("RSVP"),35);
- if ( QApplication::desktop()->width() <= 320 ) {
+ if ( QApplication::desktop()->width() <= 320 || QApplication::desktop()->height() <= 240) {
int hei = 80;
if ( QApplication::desktop()->height() <= 240 )
hei = 60;
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index bfe0aec..915c7ec 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -100,7 +100,7 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
mLocationEdit = new KOLocationBox(TRUE,parent,10);
mLocationEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) );
- if ( QApplication::desktop()->width() > 320 )
+ if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->height() > 240 )
mLocationEdit->setMaximumHeight( hei + 6);
// mLocationEdit = new QLineEdit(parent);
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index b782bb1..3ee9a22 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -285,6 +285,13 @@ void KOPrefsDialog::setupMainTab()
&(KOPrefs::instance()->mBlockPopupMenu),topFrame);
topLayout->addMultiCellWidget( widbool->checkBox(), iii,iii,0,1);
++iii;
+ if ( QApplication::desktop()->height() <= 240 ) {
+ topFrame = addPage(i18n("General") +" 2",0,0);
+ topLayout = new QGridLayout(topFrame,4,2);
+ topLayout->setSpacing(2);
+ topLayout->setMargin(3);
+ iii = 0;
+ }
QHBox *dummy = new QHBox(topFrame);
new QLabel(i18n("Days in Next-X-Days:"),dummy);
mNextXDaysSpin = new QSpinBox(2,14,1,dummy);
@@ -431,12 +438,19 @@ void KOPrefsDialog::setupTimeTab()
mAlarmTimeCombo = new QComboBox(topFrame);
mAlarmTimeCombo->insertStringList(alarmList);
topLayout->addWidget(mAlarmTimeCombo,3,1);
-
+ int iii = 4;
+ if ( QApplication::desktop()->height() <= 240 ) {
+ topFrame = addPage(i18n("Time") +" 2",0,0);
+ topLayout = new QGridLayout(topFrame,1,2);
+ topLayout->setSpacing(2);
+ topLayout->setMargin(3);
+ iii = 0;
+ }
QGroupBox *workingHoursGroup = new QGroupBox(1,Horizontal,
i18n("Working Hours"),
topFrame);
- topLayout->addMultiCellWidget(workingHoursGroup,4,4,0,1);
+ topLayout->addMultiCellWidget(workingHoursGroup,iii,iii,0,1);
workingHoursGroup->layout()->setSpacing( 0 );
workingHoursGroup->layout()->setMargin( 4 );
QHBox *workStartBox = new QHBox(workingHoursGroup);
@@ -702,6 +716,18 @@ void KOPrefsDialog::setupViewsTab()
addWidBool(i18n("Category colors are applied to text"),
&(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
topLayout->addWidget(dummy->checkBox(),ii++,0);
+
+
+
+ if ( QApplication::desktop()->height() <= 240 ) {
+ topFrame = addPage(i18n("Month View") +" 2",0,0);
+ topLayout = new QGridLayout(topFrame,4,1);
+ topLayout->setSpacing(2);
+ topLayout->setMargin(1);
+ ii = 0;
+ }
+
+
coloredCategoriesInMonthView =
addWidBool(i18n("Month view uses day colors"),
&(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
@@ -901,9 +927,13 @@ dummy =
addWidBool(i18n("Use internal alarm notification"),
&(KOPrefs::instance()->mUseInternalAlarmNotification),topFrame);
topLayout->addWidget(dummy->checkBox(),iii++,0);
- lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame);
- topLayout->addWidget(lab ,iii++,0);
+ if ( QApplication::desktop()->height() > 240 ) {
+
+ lab = new QLabel( i18n("Note: KO/Pi must be running to notify you about an alarm. Recommended for use on Zaurus: Disable this option and install KO/Pi alarm applet.\n"), topFrame);
+
+ topLayout->addWidget(lab ,iii++,0);
+ }
#ifndef DESKTOP_VERSION
lab->setAlignment( AlignLeft|WordBreak|AlignTop);
#else
@@ -1164,6 +1194,18 @@ void KOPrefsDialog::setupColorsTab()
topLayout->addWidget(eventColor->label(),ii,0);
topLayout->addWidget(eventColor->button(),ii++,1);
+ if ( QApplication::desktop()->height() <= 240 ) {
+ topFrame = addPage(i18n("Colors") +" 2",0,0);
+ // DesktopIcon("colorize",KIcon::SizeMedium));
+
+ topLayout = new QGridLayout(topFrame,5,2);
+ // topLayout->setSpacing(mSpacingHint);
+ // topLayout->setMargin(mMarginHint);
+
+ topLayout->setSpacing(2);
+ topLayout->setMargin(3);
+ }
+
// agenda view background color
KPrefsDialogWidColor *agendaBgColor =
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 2c04852..0cb0bce 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -625,7 +625,7 @@ void MainWindow::initActions()
int pixWid = 22, pixHei = 22;
QString pathString = "";
if ( !p->mToolBarMiniIcons ) {
- if ( QApplication::desktop()->width() < 480 ) {
+ if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
pathString += "icons16/";
pixWid = 18; pixHei = 16;
}
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index ef2fc1c..7b3b543 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -70,6 +70,11 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
mAddItems = new QCheckBox(i18n("Add items"),topFrame);
subLayout->addWidget(mAddItems);
+ QPushButton *togButton = new QPushButton( "", topFrame );
+ subLayout->addWidget(togButton);
+ connect(togButton,SIGNAL(clicked()),SLOT(toggleCheckboxes()));
+ togButton->setPixmap(SmallIcon("1updownarrow"));
+ togButton->setMinimumWidth( togButton->sizeHint().height() );
searchEdit->setText("*"); // Find all events by default
searchEdit->setFocus();
connect(searchEdit, SIGNAL(textChanged ( const QString & )),this,SLOT(searchTextChanged( const QString & )));
@@ -78,7 +83,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
// QGroupBox *subjectGroup = new QGroupBox(1,Vertical,i18n("Search In"),
// topFrame);
- QHBox *incidenceGroup = new QHBox( topFrame );
+ incidenceGroup = new QHBox( topFrame );
layout->addWidget(incidenceGroup);
mSearchEvent = new QCheckBox(i18n("Events"),incidenceGroup);
@@ -86,7 +91,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
mSearchTodo = new QCheckBox(i18n("Todos"),incidenceGroup);
mSearchJournal = new QCheckBox(i18n("Journals"),incidenceGroup);
- QHBox *subjectGroup = new QHBox( topFrame );
+ subjectGroup = new QHBox( topFrame );
layout->addWidget(subjectGroup);
mSummaryCheck = new QCheckBox(i18n("Summary/Loc."),subjectGroup);
@@ -94,7 +99,7 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
mDescriptionCheck = new QCheckBox(i18n("Details"),subjectGroup);
mCategoryCheck = new QCheckBox(i18n("Categories"),subjectGroup);
- QHBox *attendeeGroup = new QHBox( topFrame );
+ attendeeGroup = new QHBox( topFrame );
layout->addWidget(attendeeGroup );
new QLabel( i18n("Attendee:"),attendeeGroup );
mSearchAName = new QCheckBox(i18n("Name"),attendeeGroup );
@@ -136,6 +141,18 @@ SearchDialog::~SearchDialog()
{
}
+void SearchDialog::toggleCheckboxes()
+{
+ if ( incidenceGroup->isVisible() ) {
+ incidenceGroup->hide() ;
+ subjectGroup->hide() ;
+ attendeeGroup->hide() ;
+ } else {
+ incidenceGroup->show() ;
+ subjectGroup->show() ;
+ attendeeGroup->show() ;
+ }
+}
void SearchDialog::raiseAndSelect()
{
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index 11ad2f0..b345b98 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -60,6 +60,7 @@ class SearchDialog : public QVBox
void accept();
void doSearch();
void searchTextChanged( const QString &_text );
+ void toggleCheckboxes();
signals:
void showEventSignal(Event *);
@@ -67,6 +68,8 @@ class SearchDialog : public QVBox
void deleteEventSignal(Event *);
private:
+
+ QHBox *incidenceGroup ,*subjectGroup ,*attendeeGroup;
void search(const QRegExp &);
Calendar *mCalendar;
diff --git a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
index 93538ec..d3797ae 100644
--- a/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
+++ b/libkdepim/kcmconfigs/kdepimconfigwidget.cpp
@@ -176,7 +176,8 @@ void KDEPIMConfigWidget::setupStoreTab()
topLayout->addWidget( (QWidget* )holidayColor->button());
- QVBox *storePage = new QVBox( this );
+ QVBox *storePage = new QVBox( this );
+ if ( QApplication::desktop()->height() > 240 )
new QLabel( i18n("Your current storage dir is:\n%1\nYour mail is stored in:\n(storagedir)/apps/kopiemail/localmail").arg(KGlobal::dirs()->localkdedir()), storePage );
new QLabel( i18n("<b>New data storage dir:</b>"), storePage );
mStoreUrl = new KURLRequester( storePage );
@@ -290,32 +291,35 @@ void KDEPIMConfigWidget::setupExternalAppTab()
mParameters = new QLineEdit(mExternalAppGroupBox);
mParameters->setReadOnly(true);
boxLayout->addWidget( mParameters, 4, 1 );
-
- lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
- boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
-
-
- lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
- boxLayout->addWidget( lab, 6, 0 );
- mMessage2 = new QLineEdit(mExternalAppGroupBox);
- mMessage2->setReadOnly(true);
- boxLayout->addWidget( mMessage2 , 7, 0);
-
- lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
- boxLayout->addWidget( lab, 6, 1 );
- mParameters2 = new QLineEdit(mExternalAppGroupBox);
- mParameters2->setReadOnly(true);
- boxLayout->addWidget( mParameters2, 7, 1 );
-
- lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
- boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 );
-
+ lab = new QLabel( i18n("HINT: Delimiter=; Name=%1,Email=%2"), mExternalAppGroupBox);
+ boxLayout->addMultiCellWidget( lab, 5, 5, 0, 1 );
+
+
+ if ( QApplication::desktop()->height() > 240 ) {
+ lab = new QLabel( i18n("extra Message:"), mExternalAppGroupBox);
+ boxLayout->addWidget( lab, 6, 0 );
+ mMessage2 = new QLineEdit(mExternalAppGroupBox);
+ mMessage2->setReadOnly(true);
+ boxLayout->addWidget( mMessage2 , 7, 0);
+
+ lab = new QLabel( i18n("extra Parameters:"), mExternalAppGroupBox);
+ boxLayout->addWidget( lab, 6, 1 );
+ mParameters2 = new QLineEdit(mExternalAppGroupBox);
+ mParameters2->setReadOnly(true);
+ boxLayout->addWidget( mParameters2, 7, 1 );
+
+ lab = new QLabel( i18n("HINT: Emails=%1,Attachments=%2"), mExternalAppGroupBox);
+ boxLayout->addMultiCellWidget( lab, 8, 8, 0, 1 );
+ connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
+ connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
+ } else {
+ mMessage2 = 0;
+ mParameters2 = 0;
+ }
connect( mChannel, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
connect( mMessage, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
connect( mParameters, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
- connect( mMessage2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
- connect( mParameters2, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
layout->addWidget( mExternalAppGroupBox );
@@ -374,12 +378,15 @@ void KDEPIMConfigWidget::setupLocaleDateTab()
lab = new QLabel( i18n("Monday 19 April 2004: %A %d %B %Y"), topFrame);
topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
++iii;
- lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
- topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
- ++iii;
- lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
- topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
- ++iii;
+ //qDebug(" QApplication::desktop()->height()xx %d ", QApplication::desktop()->height() );
+ if ( QApplication::desktop()->height() > 240 ) {
+ lab = new QLabel( i18n("Mon 19.04.04: %a %d.%m.%y"), topFrame);
+ topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
+ ++iii;
+ lab = new QLabel( i18n("Mon, 19.Apr.04: %a, %d.%b.%y"), topFrame);
+ topLayout->addMultiCellWidget(lab ,iii,iii,0,1);
+ ++iii;
+ }
connect( mUserDateFormatLong, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
connect( mUserDateFormatShort, SIGNAL( textChanged ( const QString & )), this, SLOT( textChanged ( const QString & )) );
@@ -628,8 +635,10 @@ void KDEPIMConfigWidget::saveEditFieldSettings()
mEmailOtherChannel = mChannel->text();
mEmailOtherMessage = mMessage->text();
mEmailOtherMessageParameters = mParameters->text();
- mEmailOtherMessage2 = mMessage2->text();
- mEmailOtherMessageParameters2 = mParameters2->text();
+ if ( mMessage2 )
+ mEmailOtherMessage2 = mMessage2->text();
+ if ( mParameters2 )
+ mEmailOtherMessageParameters2 = mParameters2->text();
}
else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
{
@@ -693,8 +702,10 @@ void KDEPIMConfigWidget::updateClientWidgets()
//Otherwise take the default data from externalapphandler.
mChannel->setText(dai->_channel);
mMessage->setText(dai->_message);
- mParameters->setText(dai->_parameters);
- mMessage2->setText(dai->_message2);
+ mParameters->setText(dai->_parameters);
+ if ( mMessage2 )
+ mMessage2->setText(dai->_message2);
+ if ( mParameters2 )
mParameters2->setText(dai->_parameters2);
@@ -702,8 +713,10 @@ void KDEPIMConfigWidget::updateClientWidgets()
{
mChannel->setText(mEmailOtherChannel);
mMessage->setText(mEmailOtherMessage);
- mParameters->setText(mEmailOtherMessageParameters);
+ mParameters->setText(mEmailOtherMessageParameters);
+ if ( mMessage2 )
mMessage2->setText(mEmailOtherMessage2);
+ if ( mParameters2 )
mParameters2->setText(mEmailOtherMessageParameters2);
}
else if ((mCurrentApp == ExternalAppHandler::PHONE) && (mCurrentClient == KPimGlobalPrefs::OTHER_PHC))
@@ -773,14 +786,18 @@ void KDEPIMConfigWidget::updateClientWidgets()
mChannel->setReadOnly(readonly);
mMessage->setReadOnly(readonly);
- mParameters->setReadOnly(readonly);
+ mParameters->setReadOnly(readonly);
+ if ( mMessage2 )
mMessage2->setReadOnly(readonly);
+ if ( mParameters2 )
mParameters2->setReadOnly(readonly);
mChannel->setEnabled(enabled);
mMessage->setEnabled(enabled);
mParameters->setEnabled(enabled);
+ if ( mMessage2 )
mMessage2->setEnabled(enabled);
+ if ( mParameters2 )
mParameters2->setEnabled(enabled);
@@ -794,12 +811,16 @@ void KDEPIMConfigWidget::updateClientWidgets()
}
else
{
+ if ( mMessage2 )
mMessage2->setText( "" );
+ if ( mParameters2 )
mParameters2->setText( "" );
}
if (enabled == true) {
+ if ( mMessage2 )
mMessage2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL);
+ if ( mParameters2 )
mParameters2->setEnabled(mCurrentApp == ExternalAppHandler::EMAIL);
}
diff --git a/microkde/kcolorbutton.cpp b/microkde/kcolorbutton.cpp
index c7c6088..96dc256 100644
--- a/microkde/kcolorbutton.cpp
+++ b/microkde/kcolorbutton.cpp
@@ -32,7 +32,7 @@ void KColorButton:: edit()
KColorButton::KColorButton( QWidget *p ):QPushButton( p )
{
int size = 24;
- if( QApplication::desktop()->width() < 480 )
+ if( QApplication::desktop()->width() < 480 || QApplication::desktop()->height() <= 320 )
size = 18;
setFixedSize( size,size );
connect ( this, SIGNAL( clicked() ), this ,SLOT (edit() ));