summaryrefslogtreecommitdiffabout
path: root/korganizer
Side-by-side diff
Diffstat (limited to 'korganizer') (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
7 files changed, 74 insertions, 11 deletions
diff --git a/korganizer/kodialogmanager.cpp b/korganizer/kodialogmanager.cpp
index 3dfa344..5455098 100644
--- a/korganizer/kodialogmanager.cpp
+++ b/korganizer/kodialogmanager.cpp
@@ -103,9 +103,10 @@ void KODialogManager::showOptionsDialog( bool showSync )
connect(mOptionsDialog,SIGNAL(configChanged()),
mMainView,SLOT(updateConfig()));
}
mOptionsDialog->readConfig();
-#ifndef DESKTOP_VERSION
+#ifndef DESKTOP_VERSION
+ mOptionsDialog->hideButtons();
mOptionsDialog->showMaximized();
#else
mOptionsDialog->show();
#endif
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index bdfc637..6ecf978 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -86,9 +86,9 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
mListView->addColumn(i18n("Email"),180);
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;
mListView->setFixedHeight(hei);
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index bfe0aec..915c7ec 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -99,9 +99,9 @@ void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
headerLayout->addWidget(locationLabel,2,0);
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);
connect ( mLocationEdit->lineEdit(), SIGNAL ( returnPressed() ), this, SIGNAL (allAccepted () ) );
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index b782bb1..3ee9a22 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -284,8 +284,15 @@ void KOPrefsDialog::setupMainTab()
widbool = addWidBool(i18n("Block popup until mouse button release"),
&(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);
@@ -430,14 +437,21 @@ void KOPrefsDialog::setupTimeTab()
3,0);
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);
// workStartBox->setMargin( 0 );
@@ -701,8 +715,20 @@ void KOPrefsDialog::setupViewsTab()
dummy =
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);
topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
@@ -900,11 +926,15 @@ dummy =
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
lab->setAlignment( AlignLeft|BreakAnywhere|WordBreak|AlignTop);
@@ -1163,8 +1193,20 @@ void KOPrefsDialog::setupColorsTab()
&(KOPrefs::instance()->mTodoDoneColor),topFrame);
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 =
addWidColor(i18n("Agenda view background color:"),
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 2c04852..0cb0bce 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -624,9 +624,9 @@ void MainWindow::initActions()
QIconSet icon;
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;
}
} else {
diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp
index ef2fc1c..7b3b543 100644
--- a/korganizer/searchdialog.cpp
+++ b/korganizer/searchdialog.cpp
@@ -69,33 +69,38 @@ 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 & )));
connect(searchEdit, SIGNAL( returnPressed () ),this,SLOT(doSearch()));
// Subjects to search
// 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);
//mSearchEvent->setChecked(true);
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);
mSummaryCheck->setChecked(true);
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 );
mSearchAEmail = new QCheckBox(i18n("Email"), attendeeGroup );
@@ -135,8 +140,20 @@ SearchDialog::SearchDialog(Calendar *calendar,CalendarView *parent)
SearchDialog::~SearchDialog()
{
}
+void SearchDialog::toggleCheckboxes()
+{
+ if ( incidenceGroup->isVisible() ) {
+ incidenceGroup->hide() ;
+ subjectGroup->hide() ;
+ attendeeGroup->hide() ;
+ } else {
+ incidenceGroup->show() ;
+ subjectGroup->show() ;
+ attendeeGroup->show() ;
+ }
+}
void SearchDialog::raiseAndSelect()
{
static int currentState = 0;
diff --git a/korganizer/searchdialog.h b/korganizer/searchdialog.h
index 11ad2f0..b345b98 100644
--- a/korganizer/searchdialog.h
+++ b/korganizer/searchdialog.h
@@ -59,15 +59,18 @@ class SearchDialog : public QVBox
void setFocusToList();
void accept();
void doSearch();
void searchTextChanged( const QString &_text );
+ void toggleCheckboxes();
signals:
void showEventSignal(Event *);
void editEventSignal(Event *);
void deleteEventSignal(Event *);
private:
+
+ QHBox *incidenceGroup ,*subjectGroup ,*attendeeGroup;
void search(const QRegExp &);
Calendar *mCalendar;