[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kdab-post-4.0/kdepim
From:       Till Adam <adam () kde ! org>
Date:       2007-11-10 17:15:25
Message-ID: 1194714925.563363.19727.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 735013 by tilladam:

Merged revisions 734927-735011 via svnmerge from 
svn+ssh://tilladam@svn.kde.org/home/kde/trunk/KDE/kdepim

........
  r734949 | djarvie | 2007-11-10 16:23:40 +0100 (Sat, 10 Nov 2007) | 1 line
  
  Clarification
........
  r734965 | pino | 2007-11-10 16:47:47 +0100 (Sat, 10 Nov 2007) | 3 lines
  
  icon renamings:
  - view-remove -> view-close
........
  r734984 | pino | 2007-11-10 17:26:33 +0100 (Sat, 10 Nov 2007) | 3 lines
  
  icon renaming:
  - exec -> system-run
........
  r735008 | winterz | 2007-11-10 17:59:19 +0100 (Sat, 10 Nov 2007) | 3 lines
  
  compile++
  include <kcal/calendarlocal.h>
........
  r735009 | winterz | 2007-11-10 17:59:46 +0100 (Sat, 10 Nov 2007) | 3 lines
  
  compile++
  include <kurl.h>
........


 _M            . (directory)  
 M  +1 -1      akregator/src/searchbar.cpp  
 M  +1 -1      console/konsolekalendar/main.cpp  
 M  +4 -3      doc/kalarm/index.docbook  
 M  +1 -1      kaddressbook/viewmanager.cpp  
 M  +1 -1      kalarm/eventlistmodel.cpp  
 M  +2 -2      kalarm/newalarmaction.cpp  
 M  +0 -1      kontact/plugins/knotes/summarywidget.cpp  


** branches/work/kdab-post-4.0/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,71 \
1623,712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,729306,729611,731653,733159,733883,734242,734247,734273 \
/trunk/KDE/kdepim:1-734926  + \
/branches/kdepim/enterprise/kdepim:1-708704,708706,708741,708749,709066,711604,711623, \
712056,714358,715112,717162,717727,723348-723367,723653,724153,724155,724546,729306,729611,731653,733159,733883,734242,734247,734273 \
                /trunk/KDE/kdepim:1-735011
--- branches/work/kdab-post-4.0/kdepim/akregator/src/searchbar.cpp #735012:735013
@@ -83,7 +83,7 @@
 
     d->searchCombo = new KComboBox(this);
 
-    QIcon iconAll = KIconLoader::global()->loadIcon("exec", KIconLoader::Small);
+    QIcon iconAll = KIconLoader::global()->loadIcon("system-run", \
                KIconLoader::Small);
     QIcon iconNew(KStandardDirs::locate("data", "akregator/pics/kmmsgnew.png"));
     QIcon iconUnread(KStandardDirs::locate("data", \
                "akregator/pics/kmmsgunseen.png"));
     QIcon iconKeep(KStandardDirs::locate("data", "akregator/pics/kmmsgflag.png"));
--- branches/work/kdab-post-4.0/kdepim/console/konsolekalendar/main.cpp \
#735012:735013 @@ -38,8 +38,8 @@
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
+#include <kurl.h>
 #include <kdebug.h>
-#include <KUrl.h>
 
 #include <kcal/calformat.h>
 #include <kcal/calendarresources.h>
--- branches/work/kdab-post-4.0/kdepim/doc/kalarm/index.docbook #735012:735013
@@ -147,9 +147,10 @@
 <para>The main &kalarm; window displays the current list of pending
 alarms, showing their times, repetition intervals, colors, and
 message texts, names of files to display, commands to execute or email
-subjects. (For a recurring alarm or an alarm with a reminder, the time
-shown is its next scheduled trigger time.) An icon at the left of each
-alarm text/file/command/email subject indicates the type of
+subjects. (For a recurring alarm, the time shown is its next scheduled
+trigger time. For an alarm with a reminder, the time shown is the time
+of the alarm proper, not the reminder time.) An icon at the left of
+each alarm text/file/command/email subject indicates the type of
 alarm.</para>
 
 <screenshot>
--- branches/work/kdab-post-4.0/kdepim/kaddressbook/viewmanager.cpp #735012:735013
@@ -599,7 +599,7 @@
   action->setWhatsThis( i18n( "You can add a new view by choosing one from the \
dialog that appears after pressing the button. You have to give the view a name, so \
that you can distinguish between the different views." ) );  
   mActionDeleteView = coll->addAction( "view_delete" );
-  mActionDeleteView->setIcon( KIcon("view-remove") );
+  mActionDeleteView->setIcon( KIcon("view-close") );
   mActionDeleteView->setText( i18n( "Delete View" ) );
   connect(mActionDeleteView, SIGNAL(triggered(bool) ), SLOT( deleteView() ));
   mActionDeleteView->setWhatsThis( i18n( "By pressing this button you can delete the \
                actual view, which you have added before." ) );
--- branches/work/kdab-post-4.0/kdepim/kalarm/eventlistmodel.cpp #735012:735013
@@ -85,7 +85,7 @@
 	{
 		mTextIcon    = new QPixmap(SmallIcon("text"));
 		mFileIcon    = new QPixmap(SmallIcon("document-open"));
-		mCommandIcon = new QPixmap(SmallIcon("exec"));
+		mCommandIcon = new QPixmap(SmallIcon("system-run"));
 		mEmailIcon   = new QPixmap(SmallIcon("mail"));
 		mIconSize = mTextIcon->size().expandedTo(mFileIcon->size()).expandedTo(mCommandIcon->size()).expandedTo(mEmailIcon->size());
  }
--- branches/work/kdab-post-4.0/kdepim/kalarm/newalarmaction.cpp #735012:735013
@@ -34,9 +34,9 @@
 	: KActionMenu(KIcon("document-new"), label, parent)
 {
 	setShortcuts(KStandardShortcut::openNew());
-	QAction* act = menu()->addAction(KIcon(QLatin1String("view-remove")), (templates ? \
i18nc("@item:inmenu", "&Display Alarm Template") : i18nc("@item:inmenu", "Display \
Alarm"))); +	QAction* act = menu()->addAction(KIcon(QLatin1String("view-close")), \
(templates ? i18nc("@item:inmenu", "&Display Alarm Template") : i18nc("@item:inmenu", \
"Display Alarm")));  mTypes[act] = EditAlarmDlg::DISPLAY;
-	mCommandAction = menu()->addAction(KIcon(QLatin1String("exec")), (templates ? \
i18nc("@item:inmenu", "&Command Alarm Template") : i18nc("@item:inmenu", "Command \
Alarm"))); +	mCommandAction = menu()->addAction(KIcon(QLatin1String("system-run")), \
(templates ? i18nc("@item:inmenu", "&Command Alarm Template") : i18nc("@item:inmenu", \
"Command Alarm")));  mTypes[mCommandAction] = EditAlarmDlg::COMMAND;
 	act = menu()->addAction(KIcon(QLatin1String("mail")), (templates ? \
i18nc("@item:inmenu", "&Email Alarm Template") : i18nc("@item:inmenu", "Email \
Alarm")));  mTypes[act] = EditAlarmDlg::EMAIL;
--- branches/work/kdab-post-4.0/kdepim/kontact/plugins/knotes/summarywidget.cpp \
#735012:735013 @@ -25,7 +25,6 @@
 #include <QLabel>
 #include <QLayout>
 
-//Added by qt3to4:
 #include <QVBoxLayout>
 #include <QPixmap>
 #include <QGridLayout>


[prev in list] [next in list] [prev in thread] [next in thread]