Hello community,
here is the log from the commit of package kadu for openSUSE:Factory
checked in at Tue Oct 18 14:11:44 CEST 2011.
--------
--- openSUSE:Factory/kadu/kadu.changes 2011-09-23 02:04:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/kadu/kadu.changes 2011-09-26 21:52:37.000000000 +0200
@@ -1,0 +2,20 @@
+Mon Sep 26 19:51:12 UTC 2011 - fisiu@opensuse.org
+
+- Changed License to GPL-3.0+, fix bnc#718899
+
+-------------------------------------------------------------------
+Sun Sep 11 23:42:34 UTC 2011 - fisiu@opensuse.org
+
+- Upstream update to 0.10.0:
+ * file transfers in Gadu-Gadu and Jabber/XMPP networks,
+ * chat window notifications,
+ * better integration with popular Linux desktop environments,
+ * support for Gadu-Gadu 10 contact list and its automatic synchronization,
+ * automatic recognition of lost Internet connection,
+ * greater stability and more enhancements,
+ * new translations.
+- Drop kadu-0.9.2-remove-Gaia-and-Pushpin-theme.diff:
+ fixed upstream.
+- External plugins updated.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
anonymous_check-0.6.6.1.tar.bz2
globalhotkeys-0.9.0-23.tar.gz
kadu-0.9.2-remove-Gaia-and-Pushpin-theme.diff
kadu-0.9.2.tar.bz2
lednotify-0.9.0-28.tar.gz
mime_tex-0.6.6.6.tar.bz2
nextinfo-0.9.0-5.tar.gz
panelkadu-0.9.0-7.tar.gz
senthistory-0.9.0-7.tar.gz
New:
----
anonymous_check-0.10.1.tar.bz2
enable_external_plugins.patch
globalhotkeys-0.10-25.tar.gz
import_history-0.10.0.tar.bz2
kadu-0.10.0.tar.bz2
lednotify-0.10-29.tar.gz
messagessplitter-0.10-2.tar.gz
mime_tex-0.10.1.tar.bz2
networkping-0.10-1.tar.gz
nextinfo-0.10-6.tar.gz
panelkadu-0.10-8.tar.gz
senthistory-0.10-9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kadu.spec ++++++
++++ 849 lines (skipped)
++++ between openSUSE:Factory/kadu/kadu.spec
++++ and /mounts/work_src_done/STABLE/kadu/kadu.spec
++++++ anonymous_check-0.6.6.1.tar.bz2 -> anonymous_check-0.10.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/anonymous_check/CMakeLists.txt new/anonymous_check/CMakeLists.txt
--- old/anonymous_check/CMakeLists.txt 2010-12-07 13:09:32.000000000 +0100
+++ new/anonymous_check/CMakeLists.txt 2011-08-24 00:09:03.000000000 +0200
@@ -1,20 +1,31 @@
+project (anonymous_check)
+
+# minimal required versions
+cmake_minimum_required (VERSION 2.8)
+set (QT_MIN_VERSION "4.7.0")
+set (CMAKE_MIN_VERSION "2.8.0")
+
+set (KADU_FIND_REQUIRED true)
+include (FindKadu)
+
set (SOURCES
anonymous_check.cpp
- anonymous_check-module.cpp
- anonymous_info.cpp
+ anonymous_check-plugin.cpp
+ anonymous_info.cpp
)
set (MOC_SOURCES
+ anonymous_check-plugin.h
anonymous_check.h
)
set (TRANSLATION_SOURCES
- translations/anonymous_check.ts
+ translations/anonymous_check_pl.ts
)
-kadu_module (anonymous_check
- MODULE_SOURCES ${SOURCES}
- MODULE_MOC_SOURCES ${MOC_SOURCES}
- MODULE_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
+kadu_plugin (anonymous_check
+ PLUGIN_SOURCES ${SOURCES}
+ PLUGIN_MOC_SOURCES ${MOC_SOURCES}
+ PLUGIN_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/anonymous_check/ChangeLog new/anonymous_check/ChangeLog
--- old/anonymous_check/ChangeLog 2010-12-07 13:09:32.000000000 +0100
+++ new/anonymous_check/ChangeLog 2011-08-24 00:14:46.000000000 +0200
@@ -1,3 +1,7 @@
+2011-08-23 Piotr Galiszewski
+
+ * Module updated to Kadu 0.10 API
+
2010-12-07 Patryk Cisek
* Rewritten module from scratch because of major API changes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/anonymous_check/anonymous_check-module.cpp new/anonymous_check/anonymous_check-module.cpp
--- old/anonymous_check/anonymous_check-module.cpp 2010-12-07 13:09:32.000000000 +0100
+++ new/anonymous_check/anonymous_check-module.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-/*
- * Copyright © 2008 Patryk Cisek, PK Team
- * Copyright © 2010, Patryk Cisek
- *
- * This file is part of anonymous_check.
- *
- * anonymous_check is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * anonymous_check is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with anonymous_check. If not, see http://www.gnu.org/licenses/.
- */
-
-
-#include "anonymous_check.h"
-
-#include "debug.h"
-
-AnonCheck::AnonymousCheck *anonymousCheck = 0;
-
-extern "C" int anonymous_check_init() {
- kdebugf();
- anonymousCheck = new AnonCheck::AnonymousCheck();
- kdebugf2();
- return 0;
-}
-
-extern "C" void anonymous_check_close() {
- kdebugf();
- if(0 != anonymousCheck) {
- delete anonymousCheck;
- anonymousCheck = 0;
- }
- kdebugf2();
-}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/anonymous_check/anonymous_check-plugin.cpp new/anonymous_check/anonymous_check-plugin.cpp
--- old/anonymous_check/anonymous_check-plugin.cpp 1970-01-01 01:00:00.000000000 +0100
+++ new/anonymous_check/anonymous_check-plugin.cpp 2011-08-23 23:07:24.000000000 +0200
@@ -0,0 +1,41 @@
+/*
+ * %kadu copyright begin%
+ * Copyright 2011 Piotr Galiszewski (piotr.galiszewski@kkadu.im)
+ * %kadu copyright end%
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+
+#include "anonymous_check.h"
+
+#include "anonymous_check-plugin.h"
+
+AnonymousCheckPlugin::~AnonymousCheckPlugin()
+{
+}
+
+int AnonymousCheckPlugin::init(bool firstLoad)
+{
+ Q_UNUSED(firstLoad)
+
+ AnonymousCheckInstance = new AnonCheck::AnonymousCheck(this);
+
+ return 0;
+}
+
+void AnonymousCheckPlugin::done()
+{
+}
+
+Q_EXPORT_PLUGIN2(anonymous_check, AnonymousCheckPlugin)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/anonymous_check/anonymous_check-plugin.h new/anonymous_check/anonymous_check-plugin.h
--- old/anonymous_check/anonymous_check-plugin.h 1970-01-01 01:00:00.000000000 +0100
+++ new/anonymous_check/anonymous_check-plugin.h 2011-08-23 23:28:16.000000000 +0200
@@ -0,0 +1,45 @@
+/*
+ * %kadu copyright begin%
+ * Copyright 2011 Piotr Galiszewski (piotr.galiszewski@kkadu.im)
+ * %kadu copyright end%
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ */
+
+#ifndef ANONYMOUS_CHECK_PLUGIN_H
+#define ANONYMOUS_CHECK_PLUGIN_H
+
+#include "plugins/generic-plugin.h"
+
+namespace AnonCheck
+{
+ class AnonymousCheck;
+}
+
+class AnonymousCheckPlugin : public QObject, public GenericPlugin
+{
+ Q_OBJECT
+ Q_INTERFACES(GenericPlugin)
+
+ AnonCheck::AnonymousCheck *AnonymousCheckInstance;
+
+public:
+ virtual ~AnonymousCheckPlugin();
+
+ virtual int init(bool firstLoad);
+ virtual void done();
+
+};
+
+#endif // ANONYMOUS_CHECK_PLUGIN_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/anonymous_check/anonymous_check.cpp new/anonymous_check/anonymous_check.cpp
--- old/anonymous_check/anonymous_check.cpp 2010-12-07 13:09:32.000000000 +0100
+++ new/anonymous_check/anonymous_check.cpp 2011-08-23 23:59:11.000000000 +0200
@@ -24,6 +24,7 @@
#include "debug.h"
#include "buddies/buddy-search-criteria.h"
#include "chat/message/message-render-info.h"
+#include "chat/message/message-common.h"
#include "gui/widgets/chat-widget-manager.h"
#include "contacts/contact-set.h"
#include "protocols/services/contact-personal-info-service.h"
@@ -126,7 +127,7 @@
Chat chat = (*checkQueueIt).chatWidget()->chat();
if(!chat.isNull()) {
msg.setMessageChat(chat);
- msg.setType(Message::TypeSystem);
+ msg.setType(MessageTypeSystem);
msg.setMessageSender(*(chat.contacts().begin()));
msg.setContent(messageStr);
msg.setReceiveDate(QDateTime::currentDateTime());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/anonymous_check/anonymous_check.desc new/anonymous_check/anonymous_check.desc
--- old/anonymous_check/anonymous_check.desc 2010-12-07 13:09:32.000000000 +0100
+++ new/anonymous_check/anonymous_check.desc 2011-08-23 23:41:59.000000000 +0200
@@ -5,4 +5,5 @@
LoadByDefault=true
Provides=
Conflicts=
-Version=0.6.6.1
+Plugin=true
+Version=0.10.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/anonymous_check/translations/anonymous_check.ts new/anonymous_check/translations/anonymous_check.ts
--- old/anonymous_check/translations/anonymous_check.ts 2010-12-07 13:09:32.000000000 +0100
+++ new/anonymous_check/translations/anonymous_check.ts 1970-01-01 01:00:00.000000000 +0100
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="pl_PL">
-<context>
- <name>AnonCheck::AnonymousCheck</name>
- <message>
- <location filename="../anonymous_check.cpp" line="100"/>
- <source>Female</source>
- <translation>Kobieta</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="102"/>
- <source>Male</source>
- <translation>Mężczyzna</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="105"/>
- <source>Contact Info</source>
- <translation>Dane Kontaktu</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="108"/>
- <source>First Name</source>
- <translation>Imię</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="109"/>
- <source>Last Name</source>
- <translation>Nazwisko</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="110"/>
- <source>Family Name</source>
- <translation>Nazwisko Rodowe</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="111"/>
- <source>City</source>
- <translation>Miasto</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="112"/>
- <source>Family City</source>
- <translation>Miasto Rodzinne</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="113"/>
- <source>Nick Name</source>
- <translation>Ksywa</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="114"/>
- <source>Home Phone</source>
- <translation>Tel</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="115"/>
- <source>Mobile Phone</source>
- <translation>Kom</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="116"/>
- <source>Email</source>
- <translation>Email</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="117"/>
- <source>Website</source>
- <translation>Strona WWW</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="118"/>
- <source>Gender</source>
- <translation>Płeć</translation>
- </message>
- <message>
- <location filename="../anonymous_check.cpp" line="121"/>
- <source>Birth Year</source>
- <translation>Rok Urodzenia</translation>
- </message>
-</context>
-</TS>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/anonymous_check/translations/anonymous_check_pl.ts new/anonymous_check/translations/anonymous_check_pl.ts
--- old/anonymous_check/translations/anonymous_check_pl.ts 1970-01-01 01:00:00.000000000 +0100
+++ new/anonymous_check/translations/anonymous_check_pl.ts 2010-12-07 13:09:32.000000000 +0100
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="pl_PL">
+<context>
+ <name>AnonCheck::AnonymousCheck</name>
+ <message>
+ <location filename="../anonymous_check.cpp" line="100"/>
+ <source>Female</source>
+ <translation>Kobieta</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="102"/>
+ <source>Male</source>
+ <translation>Mężczyzna</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="105"/>
+ <source>Contact Info</source>
+ <translation>Dane Kontaktu</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="108"/>
+ <source>First Name</source>
+ <translation>Imię</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="109"/>
+ <source>Last Name</source>
+ <translation>Nazwisko</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="110"/>
+ <source>Family Name</source>
+ <translation>Nazwisko Rodowe</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="111"/>
+ <source>City</source>
+ <translation>Miasto</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="112"/>
+ <source>Family City</source>
+ <translation>Miasto Rodzinne</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="113"/>
+ <source>Nick Name</source>
+ <translation>Ksywa</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="114"/>
+ <source>Home Phone</source>
+ <translation>Tel</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="115"/>
+ <source>Mobile Phone</source>
+ <translation>Kom</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="116"/>
+ <source>Email</source>
+ <translation>Email</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="117"/>
+ <source>Website</source>
+ <translation>Strona WWW</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="118"/>
+ <source>Gender</source>
+ <translation>Płeć</translation>
+ </message>
+ <message>
+ <location filename="../anonymous_check.cpp" line="121"/>
+ <source>Birth Year</source>
+ <translation>Rok Urodzenia</translation>
+ </message>
+</context>
+</TS>
++++++ enable_external_plugins.patch ++++++
--- Plugins_orig.cmake 2011-08-24 08:43:41.000000000 +0200
+++ Plugins.cmake 2011-09-11 18:56:35.906187524 +0200
@@ -107,6 +107,27 @@ if (UNIX)
# mpd_mediaplayer
# MPRIS Media Players support
mprisplayer_mediaplayer
+ # external (community)
+ # lookup of an interlocutor in public directory
+ anonymous_check
+ # global hotkeys support
+ globalhotkeys
+ # support for importing history from gg 7 & 8
+ import_history
+ # lednotify support
+ lednotify
+ # split too long messages
+ messagessplitter
+ # mimetex support
+ mime_tex
+ # network ping support
+ networkping
+ # nextinfo
+ nextinfo
+ # panelkadu
+ panelkadu
+ # history for sent sms
+ senthistory
)
endif (UNIX)
++++++ globalhotkeys-0.9.0-23.tar.gz -> globalhotkeys-0.10-25.tar.gz ++++++
++++ 2167 lines of diff (skipped)
++++++ kadu-0.9.2.tar.bz2 -> kadu-0.10.0.tar.bz2 ++++++
openSUSE:Factory/kadu/kadu-0.9.2.tar.bz2 /mounts/work_src_done/STABLE/kadu/kadu-0.10.0.tar.bz2 differ: char 11, line 1
++++++ lednotify-0.9.0-28.tar.gz -> lednotify-0.10-29.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lednotify/CMakeLists.txt new/lednotify/CMakeLists.txt
--- old/lednotify/CMakeLists.txt 2011-03-18 00:27:44.000000000 +0100
+++ new/lednotify/CMakeLists.txt 2011-08-06 18:56:11.000000000 +0200
@@ -1,3 +1,15 @@
+project( lednotify )
+
+cmake_minimum_required( VERSION 2.8 )
+set( QT_MIN_VERSION "4.7.0" )
+set( CMAKE_MIN_VERSION "2.8.0" )
+
+set( KADU_FIND_REQUIRED true )
+include( FindKadu )
+
+include_directories( ${KADU_INCLUDE_DIR} )
+include_directories( ${KADU_INCLUDE_DIR}/kadu-core )
+
set( SOURCES
ledblinker.cpp
lednotify.cpp
@@ -9,27 +21,25 @@
)
if( WIN32 )
- list( APPEND SOURCES leddriver_win32.cpp ../module.rc )
+ list( APPEND SOURCES leddriver_win32.cpp )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
else( WIN32 )
list( APPEND SOURCES leddriver_x11.cpp )
endif( WIN32 )
-
set( TRANSLATION_SOURCES
translations/lednotify_en.ts
+ translations/lednotify_cs.ts
translations/lednotify_pl.ts
)
-
set( CONFIGURATION_FILES
configuration/lednotify.ui
)
-
-kadu_module( lednotify
- MODULE_SOURCES ${SOURCES}
- MODULE_MOC_SOURCES ${MOC_SOURCES}
- MODULE_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
- MODULE_CONFIGURATION_FILES ${CONFIGURATION_FILES}
+kadu_plugin( lednotify
+ PLUGIN_SOURCES ${SOURCES}
+ PLUGIN_MOC_SOURCES ${MOC_SOURCES}
+ PLUGIN_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
+ PLUGIN_CONFIGURATION_FILES ${CONFIGURATION_FILES}
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lednotify/changelog new/lednotify/changelog
--- old/lednotify/changelog 2011-03-18 00:27:17.000000000 +0100
+++ new/lednotify/changelog 2011-08-06 18:56:11.000000000 +0200
@@ -1,3 +1,7 @@
+0.10-29
+* Moduł przerobiony na plugin.
+
+
0.9.0-28
* Poprawione wygaszanie diody po zakończeniu migania.
* Poprawiona konfiguracja modułu.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lednotify/lednotify.cpp new/lednotify/lednotify.cpp
--- old/lednotify/lednotify.cpp 2011-02-23 21:13:59.000000000 +0100
+++ new/lednotify/lednotify.cpp 2011-08-06 18:56:11.000000000 +0200
@@ -43,28 +43,25 @@
-extern "C" KADU_EXPORT int lednotify_init( bool firstLoad )
+int LedNotify::init( bool firstLoad )
{
Q_UNUSED( firstLoad );
- lednotify = new LedNotify();
return 0;
}
-extern "C" KADU_EXPORT void lednotify_close()
+void LedNotify::done()
{
- delete lednotify;
- lednotify = NULL;
}
-LedNotify::LedNotify( QObject *parent ) : QObject( parent ),
- Notifier( "lednotify", QT_TRANSLATE_NOOP( "@default", "Scroll Lock LED" ), "kadu_icons/notify-led" ),
+LedNotify::LedNotify() :
+ Notifier( "lednotify", QT_TRANSLATE_NOOP( "@default", "Scroll Lock LED" ), KaduIcon( "kadu_icons/notify-led" ) ),
chatBlinking_( false ), msgBlinking_( false )
{
config_file.addVariable( "LedNotify", "LEDdelay", 500 );
config_file.addVariable( "LedNotify", "LEDcount", 3 );
- MainConfigurationWindow::registerUiFile( dataPath( "kadu/modules/configuration/lednotify.ui" ) );
+ MainConfigurationWindow::registerUiFile( dataPath( "kadu/plugins/configuration/lednotify.ui" ) );
NotificationManager::instance()->registerNotifier( this );
connect( PendingMessagesManager::instance(), SIGNAL(messageRemoved(Message)) , this, SLOT(messageReceived(Message)) );
connect( ChatWidgetManager::instance() , SIGNAL(chatWidgetActivated(ChatWidget*)) , this, SLOT(chatWidgetActivated(ChatWidget*)) );
@@ -78,7 +75,7 @@
disconnect( ChatWidgetManager::instance() , SIGNAL(chatWidgetDestroying(ChatWidget*)), this, SLOT(chatWidgetActivated(ChatWidget*)) );
disconnect( PendingMessagesManager::instance(), SIGNAL(messageRemoved(Message)) , this, SLOT(messageReceived(Message)) );
NotificationManager::instance()->unregisterNotifier( this );
- MainConfigurationWindow::unregisterUiFile( dataPath( "kadu/modules/configuration/lednotify.ui" ) );
+ MainConfigurationWindow::unregisterUiFile( dataPath( "kadu/plugins/configuration/lednotify.ui" ) );
}
@@ -164,14 +161,6 @@
}
-void LedNotify::copyConfiguration( const QString &fromEvent, const QString &toEvent )
-{
- Q_UNUSED( fromEvent );
- Q_UNUSED( toEvent );
-}
-void LedNotify::mainConfigurationWindowCreated(MainConfigurationWindow* mainconfigurationwindow)
-{
- Q_UNUSED( mainconfigurationwindow );
-}
+Q_EXPORT_PLUGIN2( lednotify, LedNotify )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lednotify/lednotify.desc new/lednotify/lednotify.desc
--- old/lednotify/lednotify.desc 2011-03-18 00:27:26.000000000 +0100
+++ new/lednotify/lednotify.desc 2011-08-06 18:56:11.000000000 +0200
@@ -1,8 +1,9 @@
[Module]
+Plugin=true
Description=Notification module using Scroll Lock LED
Description[pl]=Modu� powiadamiania diod� Scroll Lock
Author=Micha� Ma�ek, Piotr "ultr" D�browski
Provides=notify_method
Base=false
LoadByDefault=false
-Version=0.9.0-28
+Version=0.10-29
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lednotify/lednotify.h new/lednotify/lednotify.h
--- old/lednotify/lednotify.h 2011-02-23 21:15:05.000000000 +0100
+++ new/lednotify/lednotify.h 2011-08-06 18:56:11.000000000 +0200
@@ -26,22 +26,25 @@
#include <QSet>
+#include "chat/message/message.h"
#include "gui/widgets/chat-widget.h"
#include "gui/windows/main-configuration-window.h"
#include "notify/notification.h"
#include "notify/notifier.h"
+#include "plugins/generic-plugin.h"
#include "ledblinker.h"
-class LedNotify : public Notifier, ConfigurationUiHandler
+class LedNotify : public Notifier, public GenericPlugin
{
Q_OBJECT
+ Q_INTERFACES( GenericPlugin )
public:
- LedNotify( QObject *parent = 0 );
+ virtual int init( bool firstLoad );
+ virtual void done();
+ LedNotify();
~LedNotify();
- virtual void copyConfiguration( const QString &fromEvent, const QString &toEvent );
- virtual void mainConfigurationWindowCreated( MainConfigurationWindow *mainconfigurationwindow );
virtual NotifierConfigurationWidget *createConfigurationWidget( QWidget *widget );
virtual void notify( Notification *notification );
private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lednotify/translations/lednotify_cs.ts new/lednotify/translations/lednotify_cs.ts
--- old/lednotify/translations/lednotify_cs.ts 1970-01-01 01:00:00.000000000 +0100
+++ new/lednotify/translations/lednotify_cs.ts 2011-08-06 18:56:11.000000000 +0200
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="cs">
+<context>
+ <name>@default</name>
+ <message>
+ <source>Notifications</source>
+ <translation>Oznámení</translation>
+ </message>
+ <message>
+ <source>LED</source>
+ <translation>LED</translation>
+ </message>
+ <message>
+ <source>General</source>
+ <translation>Obecné</translation>
+ </message>
+ <message>
+ <source>Blinking count</source>
+ <translation>Počet bliknutí</translation>
+ </message>
+ <message>
+ <source>This option doesn't affect events 'new chat' and 'new message'</source>
+ <translation>tato volba neovlivní události 'nový rozhovor' a 'nová zpráva'</translation>
+ </message>
+ <message>
+ <source>Blinking delay</source>
+ <translation>Zpoždění bliknutí</translation>
+ </message>
+ <message>
+ <source>Defines blinking frequency of the LED (half of the period)</source>
+ <translation>Určuje četnost blikání LED (polovina doby)</translation>
+ </message>
+ <message numerus="yes">
+ <source>%n millisecond(s)</source>
+ <translation>
+ <numerusform>%n milisekunda</numerusform>
+ <numerusform>%n milisekundy</numerusform>
+ <numerusform>%n milisekund</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Scroll Lock LED</source>
+ <translation>Zamknutí LED</translation>
+ </message>
+</context>
+</TS>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lednotify/translations/lednotify_en.ts new/lednotify/translations/lednotify_en.ts
--- old/lednotify/translations/lednotify_en.ts 2011-03-08 14:36:29.000000000 +0100
+++ new/lednotify/translations/lednotify_en.ts 2011-08-06 18:56:11.000000000 +0200
@@ -4,42 +4,34 @@
<context>
<name>@default</name>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="5"/>
<source>Notifications</source>
<translation>Notifications</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="9"/>
<source>LED</source>
<translation>LED</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="12"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="15"/>
<source>Blinking count</source>
<translation>Blinking count</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="17"/>
<source>This option doesn't affect events 'new chat' and 'new message'</source>
<translation>This option doesn't affect events 'new chat' and 'new message'</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="20"/>
<source>Blinking delay</source>
<translation>Blinking delay</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="22"/>
<source>Defines blinking frequency of the LED (half of the period)</source>
<translation>Defines blinking frequency of the LED (half of the period)</translation>
</message>
<message numerus="yes">
- <location filename="../.configuration-ui-translations.cpp" line="24"/>
<source>%n millisecond(s)</source>
<translation>
<numerusform>%n millisecond</numerusform>
@@ -47,7 +39,6 @@
</translation>
</message>
<message>
- <location filename="../lednotify.cpp" line="62"/>
<source>Scroll Lock LED</source>
<translation>Scroll Lock LED</translation>
</message>
++++++ mime_tex-0.6.6.6.tar.bz2 -> mime_tex-0.10.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mime_tex/CMakeLists.txt new/mime_tex/CMakeLists.txt
--- old/mime_tex/CMakeLists.txt 2011-01-03 15:15:47.000000000 +0100
+++ new/mime_tex/CMakeLists.txt 2011-08-24 01:21:25.000000000 +0200
@@ -1,3 +1,13 @@
+project (mime_tex)
+
+# minimal required versions
+cmake_minimum_required (VERSION 2.8)
+set (QT_MIN_VERSION "4.7.0")
+set (CMAKE_MIN_VERSION "2.8.0")
+
+set (KADU_FIND_REQUIRED true)
+include (FindKadu)
+
add_subdirectory (mimetex)
set (SOURCES
formula_view.cpp
@@ -175,17 +185,17 @@
data/mime_tex_icons/tex_icon.png
)
-kadu_module (mime_tex
- MODULE_SOURCES ${SOURCES}
- MODULE_MOC_SOURCES ${MOC_SOURCES}
- MODULE_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
- MODULE_CONFIGURATION_FILES ${CONFIGURATION_FILES}
+kadu_plugin (mime_tex
+ PLUGIN_SOURCES ${SOURCES}
+ PLUGIN_MOC_SOURCES ${MOC_SOURCES}
+ PLUGIN_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
+ PLUGIN_CONFIGURATION_FILES ${CONFIGURATION_FILES}
)
install (FILES ${DATA_FILES}
- DESTINATION "share/kadu/modules/data/mime_tex")
+ DESTINATION ${KADU_PLUGINS_DIR}/data/mime_tex)
install (FILES ${DATA_FILES_EDITOR_ICONS}
- DESTINATION "share/kadu/modules/data/mime_tex/editor_icons")
+ DESTINATION ${KADU_PLUGINS_DIR}/data/mime_tex/editor_icons)
install (FILES ${DATA_FILES_MIME_TEX_ICONS}
- DESTINATION "share/kadu/modules/data/mime_tex/mime_tex_icons")
+ DESTINATION ${KADU_PLUGINS_DIR}/data/mime_tex/mime_tex_icons)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mime_tex/ChangeLog new/mime_tex/ChangeLog
--- old/mime_tex/ChangeLog 2011-01-03 15:15:47.000000000 +0100
+++ new/mime_tex/ChangeLog 2011-08-24 01:24:18.000000000 +0200
@@ -1,3 +1,7 @@
+2011-08-24 Piotr Galiszewski
+
+ * Dostosowano do API Kadu 0.10
+
2011-01-03 Patryk Cisek
* Dostosowano no najnowszych (po 0.6.6-beta13) zmian w API
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mime_tex/mime_tex.cpp new/mime_tex/mime_tex.cpp
--- old/mime_tex/mime_tex.cpp 2011-01-03 15:15:47.000000000 +0100
+++ new/mime_tex/mime_tex.cpp 2011-08-24 00:56:21.000000000 +0200
@@ -19,40 +19,34 @@
#include "kadu-core/chat/chat-manager.h"
#include "kadu-core/contacts/contact-set.h"
#include "kadu-core/configuration/configuration-file.h"
-#include "kadu-core/icons-manager.cpp"
+#include "kadu-core/icons/icons-manager.h"
#include "kadu-core/gui/widgets/chat-widget-manager.h"
#include "kadu-core/gui/windows/main-window.h"
#include "kadu-core/misc/misc.h"
-#include "kadu-core/modules.h"
#include "kadu-core/debug.h"
MimeTeX::MimeTeX *mimeTeX = 0;
//static MimeTeX::UIHandler uiHandler;
-extern "C" int mime_tex_init(bool)
+int MimeTeX::MimeTeX::init(bool firstLoad)
{
- kdebugf();
- mimeTeX = new MimeTeX::MimeTeX();
- kdebugf2();
- if(NULL == mimeTeX)
- return 1;
+ Q_UNUSED(firstLoad)
+
return 0;
}
-extern "C" void mime_tex_close()
+void MimeTeX::MimeTeX::done()
{
- kdebugf();
- delete mimeTeX;
- kdebugf2();
}
+
MimeTeX::MimeTeX::MimeTeX(QObject *parent)
: QObject(parent)
{
kdebugf();
config_file.addVariable("MimeTeX", "mimetex_font_size", MimeTeX::MimeTeX::defaultFontSize());
- MainConfigurationWindow::registerUiFile(dataPath("kadu/modules/configuration/mime_tex.ui"));
+ MainConfigurationWindow::registerUiFile(dataPath("kadu/plugins/configuration/mime_tex.ui"));
TeXActionDescription = new ActionDescription(
this,
@@ -60,7 +54,7 @@
"TeXformulaAction",
this,
SLOT(TeXActionActivated(QAction *, bool)),
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/tex_icon.png"),
+ KaduIcon(dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/tex_icon.png")),
tr("Insert TeX formula"));
kdebugf2();
@@ -70,7 +64,7 @@
{
kdebugf();
emit deleting();
- MainConfigurationWindow::unregisterUiFile(dataPath("kadu/modules/configuration/mime_tex.ui"));
+ MainConfigurationWindow::unregisterUiFile(dataPath("kadu/plugins/configuration/mime_tex.ui"));
if(config_file.readBoolEntry("MimeTeX", "mimetex_remove_tmp_files", false))
{
@@ -107,3 +101,5 @@
kdebugf();
return 4; // \Large
}
+
+Q_EXPORT_PLUGIN2(mime_tex, MimeTeX::MimeTeX)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mime_tex/mime_tex.desc new/mime_tex/mime_tex.desc
--- old/mime_tex/mime_tex.desc 2011-01-03 15:15:47.000000000 +0100
+++ new/mime_tex/mime_tex.desc 2011-08-24 01:25:12.000000000 +0200
@@ -2,3 +2,5 @@
Description=Mathematical TeX formulas for chat windows
Description[pl]=Matematyczne formu�y TeX w oknach czat
Author=Patryk Cisek
+Plugin=true
+Version=0.10.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mime_tex/mime_tex.h new/mime_tex/mime_tex.h
--- old/mime_tex/mime_tex.h 2011-01-03 15:15:47.000000000 +0100
+++ new/mime_tex/mime_tex.h 2011-08-24 00:37:37.000000000 +0200
@@ -3,6 +3,8 @@
#include <QStringList>
+#include "plugins/generic-plugin.h"
+
class UserGroup;
class QWidget;
class QAction;
@@ -10,9 +12,11 @@
namespace MimeTeX {
//! This class provides "TeX formula" action
- class MimeTeX : public QObject
+ class MimeTeX : public QObject, public GenericPlugin
{
Q_OBJECT
+ Q_INTERFACES(GenericPlugin)
+
public:
/*!
* \brief Default constructor
@@ -21,7 +25,10 @@
MimeTeX(QObject *parent = 0);
//! Default destructor
- ~MimeTeX();
+ virtual ~MimeTeX();
+
+ virtual int init(bool firstLoad);
+ virtual void done();
//! Default font size used by MimeTeX (see MimeTeX tab in config dialog for details).
static int defaultFontSize();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mime_tex/mimetex/CMakeLists.txt new/mime_tex/mimetex/CMakeLists.txt
--- old/mime_tex/mimetex/CMakeLists.txt 2011-01-03 15:15:47.000000000 +0100
+++ new/mime_tex/mimetex/CMakeLists.txt 2011-08-24 01:16:04.000000000 +0200
@@ -10,4 +10,4 @@
add_executable(mimetex ${SOURCES})
target_link_libraries(mimetex m)
-install (TARGETS mimetex DESTINATION lib${LIB_SUFFIX}/kadu/modules/bin/mime_tex)
+install (TARGETS mimetex DESTINATION ${KADU_LIBDIR}/kadu/plugins/bin/mime_tex)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mime_tex/tex_formula_dialog.cpp new/mime_tex/tex_formula_dialog.cpp
--- old/mime_tex/tex_formula_dialog.cpp 2011-01-03 15:15:47.000000000 +0100
+++ new/mime_tex/tex_formula_dialog.cpp 2011-08-24 08:22:51.000000000 +0200
@@ -28,7 +28,6 @@
#include "kadu-core/configuration/configuration-file.h"
#include "kadu-core/gui/widgets/custom-input.h"
#include "kadu-core/misc/misc.h"
-#include "kadu-core/modules.h"
#include "kadu-core/debug.h"
const int formulaMargin = 5;
@@ -67,11 +66,11 @@
}
kdebugm(KDEBUG_INFO, "tmpFileName: %s\n", tmpFileName.toLatin1().constData());
QVBoxLayout *mainLayout = new QVBoxLayout(this);
- QHBoxLayout *upperLayout = new QHBoxLayout(this);
+ QHBoxLayout *upperLayout = new QHBoxLayout();
mainLayout->addLayout(upperLayout);
- QVBoxLayout *formulaLayout = new QVBoxLayout(this);
+ QVBoxLayout *formulaLayout = new QVBoxLayout();
upperLayout->addLayout(formulaLayout);
- QVBoxLayout *componentsLayout = new QVBoxLayout(this);
+ QVBoxLayout *componentsLayout = new QVBoxLayout();
upperLayout->addLayout(componentsLayout);
QLabel *formulaLabel = new QLabel(tr("Formula image"), this);
@@ -102,19 +101,19 @@
symbolsView->setViewMode(QListWidget::IconMode);
componentsView->addTab(relationsView,
- QPixmap(dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_icon.png")),
+ QPixmap(dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_icon.png")),
tr("&Relations"));
componentsView->addTab(greekLettersView,
- QPixmap(dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_icon.png")),
+ QPixmap(dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_icon.png")),
tr("&Greek Letters"));
componentsView->addTab(arrowsView,
- QPixmap(dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_icon.png")),
+ QPixmap(dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_icon.png")),
tr("&Arrows"));
componentsView->addTab(delimitersView,
- QPixmap(dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_icon.png")),
+ QPixmap(dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_icon.png")),
tr("&Delimiters"));
componentsView->addTab(symbolsView,
- QPixmap(dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_icon.png")),
+ QPixmap(dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_icon.png")),
tr("&Symbols"));
connect(relationsView, SIGNAL(itemClicked(QListWidgetItem *)), this, SLOT(insertComponentSlot(QListWidgetItem *)));
@@ -125,429 +124,429 @@
// Filling Relations tab
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_frac.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_frac.png"))),
"\\frac{}{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_index_upper.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_index_upper.png"))),
"^{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_index_lower.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_index_lower.png"))),
"_{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_sqrt.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_sqrt.png"))),
"\\sqrt{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_sqrt_n.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_sqrt_n.png"))),
"\\sqrt[]{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_geq.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_geq.png"))),
"\\geq", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_leq.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_leq.png"))),
"\\leq", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_sim.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_sim.png"))),
"\\sim", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_neq.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_neq.png"))),
"\\neq", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_equiv.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_equiv.png"))),
"\\equiv", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_approx.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_approx.png"))),
"\\approx", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_simeq.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_simeq.png"))),
"\\simeq", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_ll.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_ll.png"))),
"\\ll", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_gg.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_gg.png"))),
"\\gg", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_pm.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_pm.png"))),
"\\pm", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_in.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_in.png"))),
"\\in", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_ni.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_ni.png"))),
"\\ni", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_cap.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_cap.png"))),
"\\cap", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_cup.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_cup.png"))),
"\\cup", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_bigcap.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_bigcap.png"))),
"\\bigcap", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_bigcup.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_bigcup.png"))),
"\\bigcup", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_subset.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_subset.png"))),
"\\subset", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_supset.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_supset.png"))),
"\\supset", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_subseteq.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_subseteq.png"))),
"\\subseteq", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_supseteq.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_supseteq.png"))),
"\\supseteq", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_sum.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_sum.png"))),
"\\sum{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_sum_from.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_sum_from.png"))),
"\\sum\\limits_{}{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_sum_from_to.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_sum_from_to.png"))),
"\\sum\\limits_{}^{}{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_prod.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_prod.png"))),
"\\prod{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_prod_from.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_prod_from.png"))),
"\\prod\\limits_{}{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_prod_from_to.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_prod_from_to.png"))),
"\\prod\\limits_{}^{}{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_int.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_int.png"))),
"\\int{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_int_from.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_int_from.png"))),
"\\int\\limits_{}{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_int_from_to.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_int_from_to.png"))),
"\\int\\limits_{}^{}{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_oint.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_oint.png"))),
"\\oint{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_oint_from.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_oint_from.png"))),
"\\oint\\limits_{}{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_oint_from_to.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_oint_from_to.png"))),
"\\oint\\limits_{}^{}{}", relationsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/relations_tab_lim.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/relations_tab_lim.png"))),
"\\lim_{}{}", relationsView);
// Filling Greek Letters tab
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_alpha.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_alpha.png"))),
"\\alpha", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_beta.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_beta.png"))),
"\\beta", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_gamma.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_gamma.png"))),
"\\gamma", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_Gamma.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Gamma.png"))),
"\\Gamma", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_delta.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_delta.png"))),
"\\delta", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_Delta.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Delta.png"))),
"\\Delta", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_epsilon.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_epsilon.png"))),
"\\epsilon", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_varepsilon.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varepsilon.png"))),
"\\varepsilon", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_zeta.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_zeta.png"))),
"\\zeta", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_eta.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_eta.png"))),
"\\eta", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_theta.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_theta.png"))),
"\\theta", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_vartheta.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_vartheta.png"))),
"\\vartheta", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_Theta.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Theta.png"))),
"\\Theta", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_iota.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_iota.png"))),
"\\iota", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_kappa.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_kappa.png"))),
"\\kappa", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_lambda.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_lambda.png"))),
"\\lambda", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_Lambda.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Lambda.png"))),
"\\Lambda", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_mu.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_mu.png"))),
"\\mu", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_nu.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_nu.png"))),
"\\nu", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_xi.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_xi.png"))),
"\\xi", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_Xi.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Xi.png"))),
"\\Xi", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_pi.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_pi.png"))),
"\\pi", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_varpi.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varpi.png"))),
"\\varpi", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_Pi.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Pi.png"))),
"\\Pi", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_rho.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_rho.png"))),
"\\rho", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_varrho.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varrho.png"))),
"\\varrho", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_sigma.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_sigma.png"))),
"\\sigma", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_varsigma.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varsigma.png"))),
"\\varsigma", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_Sigma.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Sigma.png"))),
"\\Sigma", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_tau.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_tau.png"))),
"\\tau", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_upsilon.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_upsilon.png"))),
"\\upsilon", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_phi.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_phi.png"))),
"\\phi", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_varphi.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_varphi.png"))),
"\\varphi", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_Phi.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Phi.png"))),
"\\Phi", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_chi.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_chi.png"))),
"\\chi", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_psi.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_psi.png"))),
"\\psi", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_Psi.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Psi.png"))),
"\\Psi", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_omega.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_omega.png"))),
"\\omega", greekLettersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/greek_letters_tab_Omega.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/greek_letters_tab_Omega.png"))),
"\\Omega", greekLettersView);
// Filling arrows tab
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_vec.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_vec.png"))),
"\\vec{}", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_swarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_swarrow.png"))),
"\\swarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_leftarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_leftarrow.png"))),
"\\leftarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_nwarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_nwarrow.png"))),
"\\nwarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_uparrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_uparrow.png"))),
"\\uparrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_nearrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_nearrow.png"))),
"\\nearrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_rightarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_rightarrow.png"))),
"\\rightarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_searrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_searrow.png"))),
"\\searrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_leftrightarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_leftrightarrow.png"))),
"\\leftrightarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_updownarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_updownarrow.png"))),
"\\updownarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_longleftarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_longleftarrow.png"))),
"\\longleftarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_longrightarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_longrightarrow.png"))),
"\\longrightarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_longleftrightarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_longleftrightarrow.png"))),
"\\longleftrightarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_Leftarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_Leftarrow.png"))),
"\\Leftarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_Rightarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_Rightarrow.png"))),
"\\Rightarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_Uparrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_Uparrow.png"))),
"\\Uparrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_Downarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_Downarrow.png"))),
"\\Downarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_Leftrightarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_Leftrightarrow.png"))),
"\\Leftrightarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_Longleftarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_Longleftarrow.png"))),
"\\Longleftarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_Longrightarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_Longrightarrow.png"))),
"\\Longrightarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_Longleftrightarrow.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_Longleftrightarrow.png"))),
"\\Longleftrightarrow", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_leftharpoonup.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_leftharpoonup.png"))),
"\\leftharpoonup", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_leftharpoondown.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_leftharpoondown.png"))),
"\\leftharpoondown", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_rightharpoonup.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_rightharpoonup.png"))),
"\\rightharpoonup", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_rightharpoondown.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_rightharpoondown.png"))),
"\\rightharpoondown", arrowsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/arrows_tab_rightleftharpoons.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/arrows_tab_rightleftharpoons.png"))),
"\\rightleftharpoons", arrowsView);
// Filling Delimiters tab
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_lbrace.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_lbrace.png"))),
"\\lbrace", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_rbrace.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_rbrace.png"))),
"\\rbrace", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_langle.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_langle.png"))),
"\\langle", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_rangle.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_rangle.png"))),
"\\rangle", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_hat.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_hat.png"))),
"\\hat", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_overbrace.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_overbrace.png"))),
"\\overbrace{}", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_overbrace_desc.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_overbrace_desc.png"))),
"\\overbrace{}^{}", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_underbrace.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_underbrace.png"))),
"\\underbrace{}", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_underbrace_desc.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_underbrace_desc.png"))),
"\\underbrace{}_{}", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_overline.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_overline.png"))),
"\\overline{}", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_underline.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_underline.png"))),
"\\underline{}", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_left_bracket.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_left_bracket.png"))),
"\\left(", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_right_bracket.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_right_bracket.png"))),
"\\right)", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_left_square_bracket.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_left_square_bracket.png"))),
"\\left[", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_right_square_bracket.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_right_square_bracket.png"))),
"\\right]", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_left_lbrace.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_left_lbrace.png"))),
"\\left{", delimitersView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/delimiters_tab_right_rbrace.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/delimiters_tab_right_rbrace.png"))),
"\\right}", delimitersView);
// Filling Symbols tab
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_infty.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_infty.png"))),
"\\infty", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_cdot.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_cdot.png"))),
"\\cdot", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_cdots.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_cdots.png"))),
"\\cdots", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_ldots.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_ldots.png"))),
"\\ldots", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_ddots.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_ddots.png"))),
"\\ddots", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_hbar.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_hbar.png"))),
"\\hbar", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_nabla.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_nabla.png"))),
"\\nabla", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_partial.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_partial.png"))),
"\\partial", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_aleph.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_aleph.png"))),
"\\aleph", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_Re.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_Re.png"))),
"\\Re", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_Im.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_Im.png"))),
"\\Im", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_bot.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_bot.png"))),
"\\bot", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_emptyset.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_emptyset.png"))),
"\\emptyset", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_prime.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_prime.png"))),
"\\prime", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_surd.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_surd.png"))),
"\\surd", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_angle.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_angle.png"))),
"\\angle", symbolsView);
(void) new QListWidgetItem(QIcon(QPixmap(
- dataPath("kadu/modules/data/mime_tex/mime_tex_icons/symbols_tab_forall.png"))),
+ dataPath("kadu/plugins/data/mime_tex/mime_tex_icons/symbols_tab_forall.png"))),
"\\forall", symbolsView);
- undoButton = new QPushButton(QIcon(QPixmap(dataPath("kadu/modules/data/mime_tex/editor_icons/undo.png"))),
+ undoButton = new QPushButton(QIcon(QPixmap(dataPath("kadu/plugins/data/mime_tex/editor_icons/undo.png"))),
tr("&Undo"), this);
- redoButton = new QPushButton(QIcon(QPixmap(dataPath("kadu/modules/data/mime_tex/editor_icons/redo.png"))),
+ redoButton = new QPushButton(QIcon(QPixmap(dataPath("kadu/plugins/data/mime_tex/editor_icons/redo.png"))),
tr("&Redo"), this);
QPushButton *okButton = new QPushButton(tr("&Ok"), this);
QPushButton *cancelButton = new QPushButton(tr("&Cancel"), this);
@@ -557,7 +556,7 @@
mainLayout->addWidget(formulaTextEdit);
connect(&timer, SIGNAL(timeout()), this, SLOT(timeoutSlot()));
- QHBoxLayout *buttonsLayout = new QHBoxLayout(this);
+ QHBoxLayout *buttonsLayout = new QHBoxLayout();
mainLayout->addLayout(buttonsLayout);
buttonsLayout->addWidget(undoButton);
buttonsLayout->addWidget(redoButton);
@@ -626,7 +625,7 @@
for(it = arguments.constBegin(); it != arguments.constEnd(); ++it)
kdebugm(KDEBUG_INFO, "Arg[%d]=%s\n", i++, (*it).toLocal8Bit().constData());
#endif
- mimeTeXProcess.start(libPath("kadu/modules/bin/mime_tex/mimetex"),
+ mimeTeXProcess.start(libPath("kadu/plugins/bin/mime_tex/mimetex"),
arguments);
mimeTeXProcess.waitForStarted();
}
++++++ nextinfo-0.9.0-5.tar.gz -> nextinfo-0.10-6.tar.gz ++++++
++++ 1788 lines of diff (skipped)
++++++ panelkadu-0.9.0-7.tar.gz -> panelkadu-0.10-8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/panelkadu/CMakeLists.txt new/panelkadu/CMakeLists.txt
--- old/panelkadu/CMakeLists.txt 2011-02-11 12:21:36.000000000 +0100
+++ new/panelkadu/CMakeLists.txt 2011-07-07 18:17:19.000000000 +0200
@@ -1,3 +1,15 @@
+project( panelkadu )
+
+cmake_minimum_required( VERSION 2.8 )
+set( QT_MIN_VERSION "4.7.0" )
+set( CMAKE_MIN_VERSION "2.8.0" )
+
+set( KADU_FIND_REQUIRED true )
+include( FindKadu )
+
+include_directories( ${KADU_INCLUDE_DIR} )
+include_directories( ${KADU_INCLUDE_DIR}/kadu-core )
+
set( SOURCES
panelkadu.cpp
)
@@ -7,6 +19,9 @@
)
set( TRANSLATION_SOURCES
+ translations/panelkadu_en.ts
+ translations/panelkadu_cs.ts
+ translations/panelkadu_es_ES.ts
translations/panelkadu_pl.ts
)
@@ -16,9 +31,9 @@
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing" )
-kadu_module( panelkadu
- MODULE_SOURCES ${SOURCES}
- MODULE_MOC_SOURCES ${MOC_SOURCES}
- MODULE_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
- MODULE_CONFIGURATION_FILES ${CONFIGURATION_FILES}
+kadu_plugin( panelkadu
+ PLUGIN_SOURCES ${SOURCES}
+ PLUGIN_MOC_SOURCES ${MOC_SOURCES}
+ PLUGIN_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
+ PLUGIN_CONFIGURATION_FILES ${CONFIGURATION_FILES}
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/panelkadu/changelog new/panelkadu/changelog
--- old/panelkadu/changelog 2011-03-08 14:52:18.000000000 +0100
+++ new/panelkadu/changelog 2011-07-07 18:17:19.000000000 +0200
@@ -1,3 +1,7 @@
+0.9.0-7 => 0.10-8
+* Moduł przerobiony na plugin.
+
+
0.6.6-6 => 0.9.0-7
* Drobne poprawki w tłumaczeniach.
* Oznaczenie wersji dla stabilnego wydania Kadu 0.9.0.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/panelkadu/panelkadu.cpp new/panelkadu/panelkadu.cpp
--- old/panelkadu/panelkadu.cpp 2011-03-08 14:54:10.000000000 +0100
+++ new/panelkadu/panelkadu.cpp 2011-07-07 18:17:19.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
* *
-* PanelKadu module for Kadu *
+* PanelKadu plugin for Kadu *
* Copyright (C) 2008-2011 Piotr Dąbrowski ultr@ultr.pl *
* *
* This program is free software: you can redistribute it and/or modify *
@@ -52,27 +52,25 @@
-extern "C" int panelkadu_init()
+int PanelKadu::init( bool firstLoad )
{
+ Q_UNUSED( firstLoad );
kdebugf();
- panelkadu = new PanelKadu();
- MainConfigurationWindow::registerUiFile( dataPath("kadu/modules/configuration/panelkadu.ui") );
+ MainConfigurationWindow::registerUiFile( dataPath("kadu/plugins/configuration/panelkadu.ui") );
kdebugf2();
return 0;
}
-extern "C" void panelkadu_close()
+void PanelKadu::done()
{
kdebugf();
- MainConfigurationWindow::unregisterUiFile( dataPath("kadu/modules/configuration/panelkadu.ui") );
- delete panelkadu;
- panelkadu = NULL;
+ MainConfigurationWindow::unregisterUiFile( dataPath("kadu/plugins/configuration/panelkadu.ui") );
kdebugf2();
}
-PanelKadu::PanelKadu() : QObject()
+PanelKadu::PanelKadu()
{
// reparenting handling
connect( Core::instance()->kaduWindow(), SIGNAL(parentChanged(QWidget*)), this, SLOT(kaduParentChanged(QWidget*)) );
@@ -251,12 +249,6 @@
// obtain desktop dimensions
int dW = QApplication::desktop()->width();
int dH = QApplication::desktop()->height();
- // side width
- int sidewidth = 0;
- if( ( side == PANELKADU_SIDE_RIGHT ) || ( side == PANELKADU_SIDE_LEFT ) )
- sidewidth = dH;
- else
- sidewidth = dW;
// cursor distance from given side
int sidecursordist = 0;
switch( side )
@@ -507,7 +499,7 @@
mouseTimer->start( PANELKADU_MOUSEITMERINTERVAL );
// update panel configuration
configurationUpdated();
- // hide panel at module startup
+ // hide panel at plugin startup
QTimer::singleShot( 0, this, SLOT(hideKadu()) );
}
@@ -533,7 +525,7 @@
window->setMaximumSize( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
// restore old window's geometry
window->setGeometry( oldGeometry );
- if( ! Core::instance()->isClosing() ) // if the module is being unloaded
+ if( ! Core::instance()->isClosing() ) // if the plugin is being unloaded
{
// show Kadu normally
window->show();
@@ -558,3 +550,8 @@
// forward the event
return false;
}
+
+
+
+
+Q_EXPORT_PLUGIN2( panelkadu, PanelKadu )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/panelkadu/panelkadu.desc new/panelkadu/panelkadu.desc
--- old/panelkadu/panelkadu.desc 2011-03-08 14:54:23.000000000 +0100
+++ new/panelkadu/panelkadu.desc 2011-07-07 18:17:19.000000000 +0200
@@ -1,7 +1,8 @@
[Module]
+Plugin=true
Description=Makes Kadu look and behave like a panel.
Description[pl]=Sprawia, �e Kadu wygl�da i zachowuje si� jak panel.
Author=Piotr "ultr" D�browski
LoadByDefault=false
-Version=0.9.0-7
+Version=0.10-8
Base=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/panelkadu/panelkadu.h new/panelkadu/panelkadu.h
--- old/panelkadu/panelkadu.h 2011-03-08 14:54:07.000000000 +0100
+++ new/panelkadu/panelkadu.h 2011-07-07 18:17:19.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
* *
-* PanelKadu module for Kadu *
+* PanelKadu plugin for Kadu *
* Copyright (C) 2008-2011 Piotr Dąbrowski ultr@ultr.pl *
* *
* This program is free software: you can redistribute it and/or modify *
@@ -28,6 +28,7 @@
#include "configuration/configuration-aware-object.h"
#include "gui/windows/main-configuration-window.h"
+#include "plugins/generic-plugin.h"
#include "panelkadu.h"
@@ -54,10 +55,13 @@
};
-class PanelKadu : public ConfigurationUiHandler, ConfigurationAwareObject
+class PanelKadu : public ConfigurationUiHandler, public ConfigurationAwareObject, public GenericPlugin
{
Q_OBJECT
+ Q_INTERFACES( GenericPlugin )
public:
+ virtual int init( bool firstLoad );
+ virtual void done();
PanelKadu();
~PanelKadu();
void mainConfigurationWindowCreated( MainConfigurationWindow *mainConfigurationWindow );
@@ -94,6 +98,7 @@
void kaduParentChanged( QWidget *oldParent );
};
+
extern PanelKadu *panelkadu;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/panelkadu/translations/panelkadu_cs.ts new/panelkadu/translations/panelkadu_cs.ts
--- old/panelkadu/translations/panelkadu_cs.ts 1970-01-01 01:00:00.000000000 +0100
+++ new/panelkadu/translations/panelkadu_cs.ts 2011-07-07 18:17:19.000000000 +0200
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="cs">
+<context>
+ <name>@default</name>
+ <message>
+ <source>Look</source>
+ <translation>Vzhled</translation>
+ </message>
+ <message>
+ <source>PanelKadu</source>
+ <translation>Panel Kadu</translation>
+ </message>
+ <message>
+ <source>Geometry</source>
+ <translation>Uspořádání</translation>
+ </message>
+ <message>
+ <source>Side</source>
+ <translation>Strana</translation>
+ </message>
+ <message>
+ <source>Right</source>
+ <translation>Vpravo</translation>
+ </message>
+ <message>
+ <source>Bottom</source>
+ <translation>Dole</translation>
+ </message>
+ <message>
+ <source>Left</source>
+ <translation>Vlevo</translation>
+ </message>
+ <message>
+ <source>Top</source>
+ <translation>Nahoře</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <translation>Velikost</translation>
+ </message>
+ <message>
+ <source> px</source>
+ <translation> px</translation>
+ </message>
+ <message>
+ <source>User defined panel length</source>
+ <translation>Uživatelem stanovená délka panelu</translation>
+ </message>
+ <message>
+ <source>Position</source>
+ <translation>Poloha</translation>
+ </message>
+ <message>
+ <source>Length</source>
+ <translation>Délka</translation>
+ </message>
+ <message>
+ <source>Behaviour</source>
+ <translation>Chování</translation>
+ </message>
+ <message>
+ <source>Activation time</source>
+ <translation>Čas spuštění</translation>
+ </message>
+ <message numerus="yes">
+ <source>%n millisecond(s)</source>
+ <translation>
+ <numerusform>%n milisekunda</numerusform>
+ <numerusform>%n milisekundy</numerusform>
+ <numerusform>%n milisekund</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Hide panel after</source>
+ <translation>Skrýt panel po</translation>
+ </message>
+ <message numerus="yes">
+ <source>[after] %n millisecond(s)</source>
+ <translation>
+ <numerusform>[po] %n milisekundě</numerusform>
+ <numerusform>[po] %n milisekundách</numerusform>
+ <numerusform>[po] %n milisekundách</numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Hiding margin</source>
+ <translation>Skrytí okraje</translation>
+ </message>
+ <message>
+ <source>Use activation ranges</source>
+ <translation>Použít spouštěcí rozsahy</translation>
+ </message>
+ <message>
+ <source>Activation ranges</source>
+ <translation>Spouštěcí rozsahy</translation>
+ </message>
+ <message>
+ <source>Use spaces to separate ranges: '0-100 200-300 400-500'</source>
+ <translation>Použít mezery pro oddělení rozsahů: '0-100 200-300 400-500'</translation>
+ </message>
+ <message>
+ <source>Don't hide panel when active</source>
+ <translation>Neskrývat panel při činnosti</translation>
+ </message>
+</context>
+</TS>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/panelkadu/translations/panelkadu_en.ts new/panelkadu/translations/panelkadu_en.ts
--- old/panelkadu/translations/panelkadu_en.ts 2011-03-08 14:55:30.000000000 +0100
+++ new/panelkadu/translations/panelkadu_en.ts 2011-07-07 18:17:19.000000000 +0200
@@ -4,85 +4,66 @@
<context>
<name>@default</name>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="4"/>
<source>Look</source>
<translation>Look</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="7"/>
<source>PanelKadu</source>
<translation>PanelKadu</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="10"/>
<source>Geometry</source>
<translation>Geometry</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="13"/>
<source>Side</source>
<translation>Side</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="16"/>
<source>Right</source>
<translation>Right</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="19"/>
<source>Bottom</source>
<translation>Bottom</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="22"/>
<source>Left</source>
<translation>Left</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="25"/>
<source>Top</source>
<translation>Top</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="29"/>
<source>Size</source>
<translation>Size</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="31"/>
- <location filename="../.configuration-ui-translations.cpp" line="39"/>
- <location filename="../.configuration-ui-translations.cpp" line="44"/>
- <location filename="../.configuration-ui-translations.cpp" line="63"/>
<source> px</source>
<translation> px</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="34"/>
<source>User defined panel length</source>
<translation>User defined panel length</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="37"/>
<source>Position</source>
<translation>Position</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="42"/>
<source>Length</source>
<translation>Length</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="48"/>
<source>Behaviour</source>
<translation>Behaviour</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="51"/>
<source>Activation time</source>
<translation>Activation time</translation>
</message>
<message numerus="yes">
- <location filename="../.configuration-ui-translations.cpp" line="53"/>
<source>%n millisecond(s)</source>
<translation>
<numerusform>%n millisecond</numerusform>
@@ -90,12 +71,10 @@
</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="56"/>
<source>Hide panel after</source>
<translation>Hide panel after</translation>
</message>
<message numerus="yes">
- <location filename="../.configuration-ui-translations.cpp" line="58"/>
<source>[after] %n millisecond(s)</source>
<translation>
<numerusform>[after] %n millisecond</numerusform>
@@ -103,27 +82,22 @@
</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="61"/>
<source>Hiding margin</source>
<translation>Hiding margin</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="66"/>
<source>Use activation ranges</source>
<translation>Use activation ranges</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="69"/>
<source>Activation ranges</source>
<translation>Activation ranges</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="71"/>
<source>Use spaces to separate ranges: '0-100 200-300 400-500'</source>
<translation>Use spaces to separate ranges: '0-100 200-300 400-500'</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="74"/>
<source>Don't hide panel when active</source>
<translation>Don't hide panel when active</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/panelkadu/translations/panelkadu_es_ES.ts new/panelkadu/translations/panelkadu_es_ES.ts
--- old/panelkadu/translations/panelkadu_es_ES.ts 1970-01-01 01:00:00.000000000 +0100
+++ new/panelkadu/translations/panelkadu_es_ES.ts 2011-07-07 18:17:19.000000000 +0200
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="es_ES">
+<context>
+ <name>@default</name>
+ <message>
+ <source>Look</source>
+ <translation>Aspecto</translation>
+ </message>
+ <message>
+ <source>PanelKadu</source>
+ <translation>PanelKadu</translation>
+ </message>
+ <message>
+ <source>Geometry</source>
+ <translation>Geometría</translation>
+ </message>
+ <message>
+ <source>Side</source>
+ <translation>Lado</translation>
+ </message>
+ <message>
+ <source>Right</source>
+ <translation>Derecho</translation>
+ </message>
+ <message>
+ <source>Bottom</source>
+ <translation>Parte inferior</translation>
+ </message>
+ <message>
+ <source>Left</source>
+ <translation>Izquierda</translation>
+ </message>
+ <message>
+ <source>Top</source>
+ <translation>Comienzo de la página</translation>
+ </message>
+ <message>
+ <source>Size</source>
+ <translation>Tamaño</translation>
+ </message>
+ <message>
+ <source> px</source>
+ <translation>px</translation>
+ </message>
+ <message>
+ <source>User defined panel length</source>
+ <translation>Longitud del panel definido por el usuario </translation>
+ </message>
+ <message>
+ <source>Position</source>
+ <translation>Posición</translation>
+ </message>
+ <message>
+ <source>Length</source>
+ <translation>Longitud</translation>
+ </message>
+ <message>
+ <source>Behaviour</source>
+ <translation>Comportamiento</translation>
+ </message>
+ <message>
+ <source>Activation time</source>
+ <translation>Tiempo de activación</translation>
+ </message>
+ <message numerus="yes">
+ <source>%n millisecond(s)</source>
+ <translation>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Hide panel after</source>
+ <translation>Ocultar panel después</translation>
+ </message>
+ <message numerus="yes">
+ <source>[after] %n millisecond(s)</source>
+ <translation>
+ <numerusform></numerusform>
+ <numerusform></numerusform>
+ </translation>
+ </message>
+ <message>
+ <source>Hiding margin</source>
+ <translation>Ocultar margen</translation>
+ </message>
+ <message>
+ <source>Use activation ranges</source>
+ <translation>Usar rangos de activación</translation>
+ </message>
+ <message>
+ <source>Activation ranges</source>
+ <translation>Activación de los rangos</translation>
+ </message>
+ <message>
+ <source>Use spaces to separate ranges: '0-100 200-300 400-500'</source>
+ <translation>Use espacios para separar los rangos: 0 -100 200-300 400-500 '</translation>
+ </message>
+ <message>
+ <source>Don't hide panel when active</source>
+ <translation>No ocultar el panel cuando está activo</translation>
+ </message>
+</context>
+</TS>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/panelkadu/translations/panelkadu_pl.ts new/panelkadu/translations/panelkadu_pl.ts
--- old/panelkadu/translations/panelkadu_pl.ts 2011-03-08 14:55:30.000000000 +0100
+++ new/panelkadu/translations/panelkadu_pl.ts 2011-07-07 18:17:19.000000000 +0200
@@ -4,85 +4,66 @@
<context>
<name>@default</name>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="4"/>
<source>Look</source>
<translation>Wygląd</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="7"/>
<source>PanelKadu</source>
<translation>PanelKadu</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="10"/>
<source>Geometry</source>
<translation>Geometria</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="13"/>
<source>Side</source>
<translation>Strona</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="16"/>
<source>Right</source>
<translation>Prawo</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="19"/>
<source>Bottom</source>
<translation>Dół</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="22"/>
<source>Left</source>
<translation>Lewo</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="25"/>
<source>Top</source>
<translation>Góra</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="29"/>
<source>Size</source>
<translation>Rozmiar</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="31"/>
- <location filename="../.configuration-ui-translations.cpp" line="39"/>
- <location filename="../.configuration-ui-translations.cpp" line="44"/>
- <location filename="../.configuration-ui-translations.cpp" line="63"/>
<source> px</source>
<translation> px</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="34"/>
<source>User defined panel length</source>
<translation>Własna długość panelu</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="37"/>
<source>Position</source>
<translation>Pozycja</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="42"/>
<source>Length</source>
<translation>Długość</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="48"/>
<source>Behaviour</source>
<translation>Zachowanie</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="51"/>
<source>Activation time</source>
<translation>Czas aktywacji</translation>
</message>
<message numerus="yes">
- <location filename="../.configuration-ui-translations.cpp" line="53"/>
<source>%n millisecond(s)</source>
<translation>
<numerusform>%n milisekunda</numerusform>
@@ -91,12 +72,10 @@
</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="56"/>
<source>Hide panel after</source>
<translation>Ukryj panel po</translation>
</message>
<message numerus="yes">
- <location filename="../.configuration-ui-translations.cpp" line="58"/>
<source>[after] %n millisecond(s)</source>
<translation>
<numerusform>[po] %n milisekundzie</numerusform>
@@ -105,27 +84,22 @@
</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="61"/>
<source>Hiding margin</source>
<translation>Margines ukrywania</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="66"/>
<source>Use activation ranges</source>
<translation>Używaj przedziałów aktywacji</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="69"/>
<source>Activation ranges</source>
<translation>Przedziały aktywacji</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="71"/>
<source>Use spaces to separate ranges: '0-100 200-300 400-500'</source>
<translation>Użyj spacji do rozdzielenia przedziałów: '0-100 200-300 400-500'</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="74"/>
<source>Don't hide panel when active</source>
<translation>Nie ukrywaj panelu gdy aktywny</translation>
</message>
++++++ senthistory-0.9.0-7.tar.gz -> senthistory-0.10-9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/senthistory/CMakeLists.txt new/senthistory/CMakeLists.txt
--- old/senthistory/CMakeLists.txt 2011-03-08 15:14:48.000000000 +0100
+++ new/senthistory/CMakeLists.txt 2011-07-07 18:17:51.000000000 +0200
@@ -1,3 +1,15 @@
+project( senthistory )
+
+cmake_minimum_required( VERSION 2.8 )
+set( QT_MIN_VERSION "4.7.0" )
+set( CMAKE_MIN_VERSION "2.8.0" )
+
+set( KADU_FIND_REQUIRED true )
+include( FindKadu )
+
+include_directories( ${KADU_INCLUDE_DIR} )
+include_directories( ${KADU_INCLUDE_DIR}/kadu-core )
+
set( SOURCES
senthistory.cpp
)
@@ -8,16 +20,18 @@
set( TRANSLATION_SOURCES
translations/senthistory_en.ts
+ translations/senthistory_cs.ts
translations/senthistory_pl.ts
+ translations/senthistory_tr.ts
)
set( CONFIGURATION_FILES
configuration/senthistory.ui
)
-kadu_module( senthistory
- MODULE_SOURCES ${SOURCES}
- MODULE_MOC_SOURCES ${MOC_SOURCES}
- MODULE_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
- MODULE_CONFIGURATION_FILES ${CONFIGURATION_FILES}
+kadu_plugin( senthistory
+ PLUGIN_SOURCES ${SOURCES}
+ PLUGIN_MOC_SOURCES ${MOC_SOURCES}
+ PLUGIN_TRANSLATION_SOURCES ${TRANSLATION_SOURCES}
+ PLUGIN_CONFIGURATION_FILES ${CONFIGURATION_FILES}
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/senthistory/changelog new/senthistory/changelog
--- old/senthistory/changelog 2011-03-08 15:10:32.000000000 +0100
+++ new/senthistory/changelog 2011-07-07 18:17:51.000000000 +0200
@@ -1,3 +1,13 @@
+0.9.x-8 => 0.10-9
+* Moduł przerobiony na plugin.
+
+
+0.9.0-7 => 0.9.x-8
+* Przywracanie aktualnie wpisanej wiadomości po powrocie na koniec listy
+ wysłanych wiadomości.
+* Niezależne cytowanie wysłanych wiadomości w każdym oknie chatu.
+
+
0.6.6-6 => 0.9.0-7
* Drobne poprawki w tłumaczeniach.
* Oznaczenie wersji dla stabilnego wydania Kadu 0.9.0.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/senthistory/senthistory.cpp new/senthistory/senthistory.cpp
--- old/senthistory/senthistory.cpp 2010-08-25 18:01:16.000000000 +0200
+++ new/senthistory/senthistory.cpp 2011-07-07 18:17:51.000000000 +0200
@@ -1,7 +1,7 @@
/****************************************************************************
* *
-* SentHistory module for Kadu *
-* Copyright (C) 2008-2010 Piotr Dąbrowski ultr@ultr.pl *
+* SentHistory plugin for Kadu *
+* Copyright (C) 2008-2011 Piotr Dąbrowski ultr@ultr.pl *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -27,6 +27,7 @@
#include "gui/widgets/chat-edit-box.h"
#include "gui/widgets/chat-widget-manager.h"
#include "gui/windows/kadu-window.h"
+#include "gui/windows/main-configuration-window.h"
#include "gui/hot-key.h"
#include "misc/misc.h"
#include "debug.h"
@@ -41,22 +42,20 @@
-extern "C" int senthistory_init()
+int SentHistory::init( bool firstLoad )
{
+ Q_UNUSED( firstLoad );
kdebugf();
- senthistory = new SentHistory();
- MainConfigurationWindow::registerUiFile( dataPath("kadu/modules/configuration/senthistory.ui") );
+ MainConfigurationWindow::registerUiFile( dataPath("kadu/plugins/configuration/senthistory.ui") );
kdebugf2();
return 0;
}
-extern "C" void senthistory_close()
+void SentHistory::done()
{
kdebugf();
- MainConfigurationWindow::unregisterUiFile( dataPath("kadu/modules/configuration/senthistory.ui") );
- delete senthistory;
- senthistory = NULL;
+ MainConfigurationWindow::unregisterUiFile( dataPath("kadu/plugins/configuration/senthistory.ui") );
kdebugf2();
}
@@ -64,23 +63,17 @@
QList< QPair > SentHistory::sentmessages;
-SentHistory::SentHistory() : QObject()
+SentHistory::SentHistory()
{
// configuration handling
createDefaultConfiguration();
// read the configuration and force its usage
configurationUpdated();
- // variables' values
- lastChatWidget = NULL;
- message_n = 0;
- thischatonly = true;
// connect chat widgets events and handle opened ones
connect( ChatWidgetManager::instance(), SIGNAL(chatWidgetCreated(ChatWidget*)) , this, SLOT(chatCreated(ChatWidget*)) );
connect( ChatWidgetManager::instance(), SIGNAL(chatWidgetDestroying(ChatWidget*)), this, SLOT(chatDestroying(ChatWidget*)) );
foreach( ChatWidget *chatwidget, ChatWidgetManager::instance()->chats() )
- {
chatCreated( chatwidget );
- }
}
@@ -92,12 +85,6 @@
}
-void SentHistory::mainConfigurationWindowCreated( MainConfigurationWindow *mainConfigurationWindow )
-{
- Q_UNUSED( mainConfigurationWindow );
-}
-
-
void SentHistory::createDefaultConfiguration()
{
config_file.addVariable( "SentHistory", "PreviousMessage" , SENTHISTORY_DEFAULTSHORTCUT_PREVIOUSMESSAGE );
@@ -117,8 +104,16 @@
// connect new chat's events
connect( chatwidget , SIGNAL( messageSendRequested( ChatWidget* ) ) , this, SLOT( messageSendRequested( ChatWidget* ) ) );
connect( chatwidget->getChatEditBox(), SIGNAL( keyPressed( QKeyEvent*, CustomInput*, bool& ) ), this, SLOT( editKeyPressed( QKeyEvent*, CustomInput*, bool& ) ) );
+ Chat chat = chatwidget->chat();
+ if( ! messagen.contains( chat ) )
+ messagen[chat] = 0;
+ if( ! thischatonly.contains( chat ) )
+ thischatonly[chat] = true;
+ if( ! currentmessage.contains( chat ) )
+ currentmessage[chat] = QString();
}
+
void SentHistory::chatDestroying( ChatWidget *chatwidget )
{
// disconnect chat's events
@@ -133,7 +128,7 @@
Chat chat = chatwidget->chat();
QString sentmessage = chatwidget->edit()->toHtml();
// reset message number
- message_n = 0;
+ messagen[chat] = 0;
// find last message in this chat
QListIterator< QPair > it( sentmessages );
while( it.hasNext() )
@@ -161,86 +156,84 @@
if( chateditbox == NULL )
return;
ChatWidget *chatwidget = chateditbox->chatWidget();
- // check chatwidget
- if( chatwidget != lastChatWidget )
- {
- lastChatWidget = chatwidget;
- message_n = 0;
- }
+ Chat chat = chatwidget->chat();
// local sent messages' history
if( HotKey::shortCut( e, "SentHistory", "PreviousMessage") )
{
- if( thischatonly == false ) message_n = 0; // start from the begining
- thischatonly = true;
- message_n++; // next message ( "1" is first )
+ if( messagen[chat] == 0 )
+ currentmessage[chat] = chatwidget->edit()->toHtml();
+ if( thischatonly[chat] == false )
+ messagen[chat] = 0; // start from the begining
+ thischatonly[chat] = true;
+ messagen[chat]++; // previous message ( 1 is first )
inputMessage( chatwidget );
handled = true;
return;
}
if( HotKey::shortCut( e, "SentHistory", "NextMessage") )
{
- if( thischatonly == false ) message_n = 0; // start from the begining
- thischatonly = true;
- message_n--; // previous message
+ if( thischatonly[chat] == false )
+ messagen[chat] = 0; // start from the begining
+ thischatonly[chat] = true;
+ messagen[chat]--; // next message
inputMessage( chatwidget );
handled = true;
return;
}
// global sent messages' history
- else if( HotKey::shortCut( e, "SentHistory", "PreviousMessageFromAllChats") )
+ if( HotKey::shortCut( e, "SentHistory", "PreviousMessageFromAllChats") )
{
- if( thischatonly == true ) message_n = 0; // start from the begining
- thischatonly = false;
- message_n++; // next message ( "1" is first )
+ if( messagen[chat] == 0 )
+ currentmessage[chat] = chatwidget->edit()->toHtml();
+ if( thischatonly[chat] == true )
+ messagen[chat] = 0; // start from the begining
+ thischatonly[chat] = false;
+ messagen[chat]++; // previous message ( 1 is first )
inputMessage( chatwidget );
handled = true;
return;
}
- else if( HotKey::shortCut( e, "SentHistory", "NextMessageFromAllChats") )
+ if( HotKey::shortCut( e, "SentHistory", "NextMessageFromAllChats") )
{
- if( thischatonly == true ) message_n = 0; // start from the begining
- thischatonly = false;
- message_n--; // previous message
+ if( thischatonly[chat] == true )
+ messagen[chat] = 0; // start from the begining
+ thischatonly[chat] = false;
+ messagen[chat]--; // next message
inputMessage( chatwidget );
handled = true;
return;
}
- // any other key
- else
- {
- // reset message number
- message_n = 0;
- }
}
void SentHistory::inputMessage( ChatWidget* chatwidget )
{
- Chat thischat = chatwidget->chat();
- if( message_n <= 0 ) // message out of range
+ Chat chat = chatwidget->chat();
+ if( messagen[chat] <= 0 ) // message out of range
{
- // last, empty message
- chatwidget->edit()->setHtml( "" );
- message_n = 0;
+ // current message
+ messagen[chat] = 0;
+ chatwidget->edit()->setHtml( currentmessage[chat] );
+ chatwidget->edit()->moveCursor( QTextCursor::End );
return;
}
- if( message_n > (int)(sentmessages.count()) ) // message out of range
+ if( messagen[chat] > (int)(sentmessages.count()) ) // message out of range
{
// previous, valid message
- message_n = message_n - 1;
+ messagen[chat]--;
return;
}
- if( thischatonly ) // input only messages sent to this chat
+ if( thischatonly[chat] ) // input only messages sent to this chat
{
// find requested message in chat's sentmessages
int foundmessage = 0;
QListIterator< QPair > it( sentmessages );
while( it.hasNext() )
{
- if( it.peekNext().first == thischat )
+ if( it.peekNext().first == chat )
{
foundmessage++;
- if( foundmessage == message_n )
+ if( foundmessage == messagen[chat] )
{
chatwidget->edit()->setHtml( it.peekNext().second );
chatwidget->edit()->moveCursor( QTextCursor::End );
@@ -249,16 +242,21 @@
}
it.next();
}
- if( foundmessage < message_n )
+ if( foundmessage < messagen[chat] )
{
- message_n = message_n - 1;
+ // previous, valid message
+ messagen[chat]--;
return;
}
}
else // input all sent messages
{
- // message_n-1 is in range, checked alraedy
- chatwidget->edit()->setHtml( sentmessages[ message_n - 1 ].second ); // message_n==1 is the first message
+ chatwidget->edit()->setHtml( sentmessages[ messagen[chat] - 1 ].second ); // 1 is the first message
chatwidget->edit()->moveCursor( QTextCursor::End );
}
}
+
+
+
+
+Q_EXPORT_PLUGIN2( senthistory, SentHistory )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/senthistory/senthistory.desc new/senthistory/senthistory.desc
--- old/senthistory/senthistory.desc 2011-03-08 15:10:46.000000000 +0100
+++ new/senthistory/senthistory.desc 2011-07-07 18:17:51.000000000 +0200
@@ -1,7 +1,8 @@
[Module]
+Plugin=true
Description=Adds history of sent messages to chat windows
Description[pl]=Dodaje histori� wys�anych wiadomo�ci do okien rozmowy
Author=Piotr "ultr" D�browski
LoadByDefault=false
-Version=0.9.0-7
+Version=0.10-9
Base=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/senthistory/senthistory.h new/senthistory/senthistory.h
--- old/senthistory/senthistory.h 2010-08-25 17:58:28.000000000 +0200
+++ new/senthistory/senthistory.h 2011-07-07 18:17:51.000000000 +0200
@@ -1,7 +1,7 @@
/****************************************************************************
* *
-* SentHistory module for Kadu *
-* Copyright (C) 2008-2010 Piotr Dąbrowski ultr@ultr.pl *
+* SentHistory plugin for Kadu *
+* Copyright (C) 2008-2011 Piotr Dąbrowski ultr@ultr.pl *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -24,13 +24,12 @@
#include <QList>
-#include <QObject>
-#include
-#include
-#include
-#include "gui/windows/main-configuration-window.h"
+#include "chat/chat.h"
#include "configuration/configuration-aware-object.h"
+#include "gui/widgets/chat-widget.h"
+#include "gui/widgets/custom-input.h"
+#include "plugins/generic-plugin.h"
#define SENTHISTORY_DEFAULTSHORTCUT_PREVIOUSMESSAGE "Ctrl+Up"
@@ -39,13 +38,15 @@
#define SENTHISTORY_DEFAULTSHORTCUT_NEXTMESSAGEFROMALLCHATS "Ctrl+Alt+Down"
-class SentHistory : public ConfigurationUiHandler, ConfigurationAwareObject
+class SentHistory : public QObject, public ConfigurationAwareObject, public GenericPlugin
{
Q_OBJECT
+ Q_INTERFACES( GenericPlugin )
public:
+ virtual int init( bool firstLoad );
+ virtual void done();
SentHistory();
~SentHistory();
- void mainConfigurationWindowCreated( MainConfigurationWindow *mainConfigurationWindow );
protected:
void configurationUpdated();
private slots:
@@ -53,13 +54,13 @@
void chatDestroying( ChatWidget *chatwidget );
void messageSendRequested( ChatWidget *chatwidget );
void editKeyPressed( QKeyEvent* e, CustomInput* custominput, bool &handled );
- void inputMessage( ChatWidget* edit );
private:
void createDefaultConfiguration();
+ void inputMessage( ChatWidget* edit );
static QList< QPair > sentmessages;
- ChatWidget *lastChatWidget;
- int message_n;
- bool thischatonly;
+ QMap messagen;
+ QMap thischatonly;
+ QMap currentmessage;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/senthistory/translations/senthistory_cs.ts new/senthistory/translations/senthistory_cs.ts
--- old/senthistory/translations/senthistory_cs.ts 1970-01-01 01:00:00.000000000 +0100
+++ new/senthistory/translations/senthistory_cs.ts 2011-07-07 18:17:51.000000000 +0200
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="cs">
+<context>
+ <name>@default</name>
+ <message>
+ <source>Shortcuts</source>
+ <translation>Zkratky</translation>
+ </message>
+ <message>
+ <source>Chat Window</source>
+ <translation>Okno pro rozhovor</translation>
+ </message>
+ <message>
+ <source>Sent messages' history</source>
+ <translation>Poslat histori zpráv</translation>
+ </message>
+ <message>
+ <source>Previous message</source>
+ <translation>Předchozí zpráva</translation>
+ </message>
+ <message>
+ <source>Next message</source>
+ <translation>Další zpráva</translation>
+ </message>
+ <message>
+ <source>Previous message from all chats</source>
+ <translation>Předchozí zpráva ze všech rozhovorů</translation>
+ </message>
+ <message>
+ <source>Next message from all chats</source>
+ <translation>Další zpráva ze všech rozhovorů</translation>
+ </message>
+</context>
+</TS>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/senthistory/translations/senthistory_en.ts new/senthistory/translations/senthistory_en.ts
--- old/senthistory/translations/senthistory_en.ts 2011-03-08 15:11:19.000000000 +0100
+++ new/senthistory/translations/senthistory_en.ts 2011-07-07 18:17:51.000000000 +0200
@@ -4,37 +4,30 @@
<context>
<name>@default</name>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="4"/>
<source>Shortcuts</source>
<translation>Shortcuts</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="7"/>
<source>Chat Window</source>
<translation>Chat Window</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="10"/>
<source>Sent messages' history</source>
<translation>Sent messages' history</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="13"/>
<source>Previous message</source>
<translation>Previous message</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="16"/>
<source>Next message</source>
<translation>Next message</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="19"/>
<source>Previous message from all chats</source>
<translation>Previous message from all chats</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="22"/>
<source>Next message from all chats</source>
<translation>Next message from all chats</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/senthistory/translations/senthistory_pl.ts new/senthistory/translations/senthistory_pl.ts
--- old/senthistory/translations/senthistory_pl.ts 2011-02-23 22:12:10.000000000 +0100
+++ new/senthistory/translations/senthistory_pl.ts 2011-07-07 18:17:51.000000000 +0200
@@ -4,37 +4,30 @@
<context>
<name>@default</name>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="4"/>
<source>Shortcuts</source>
<translation>Skróty</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="7"/>
<source>Chat Window</source>
<translation>Okno rozmowy</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="10"/>
<source>Sent messages' history</source>
<translation>Historia wysłanych wiadomości</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="13"/>
<source>Previous message</source>
<translation>Poprzednia wiadomość</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="16"/>
<source>Next message</source>
<translation>Następna wiadomość</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="19"/>
<source>Previous message from all chats</source>
<translation>Poprzednia wiadomość ze wszystkich rozmów</translation>
</message>
<message>
- <location filename="../.configuration-ui-translations.cpp" line="22"/>
<source>Next message from all chats</source>
<translation>Następna wiadomość ze wszystkich rozmów</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/senthistory/translations/senthistory_tr.ts new/senthistory/translations/senthistory_tr.ts
--- old/senthistory/translations/senthistory_tr.ts 1970-01-01 01:00:00.000000000 +0100
+++ new/senthistory/translations/senthistory_tr.ts 2011-07-07 18:17:51.000000000 +0200
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="tr">
+<context>
+ <name>@default</name>
+ <message>
+ <source>Shortcuts</source>
+ <translation>Kısayollar</translation>
+ </message>
+ <message>
+ <source>Chat Window</source>
+ <translation>Konuşma Penceresi</translation>
+ </message>
+ <message>
+ <source>Sent messages' history</source>
+ <translation>Mesajlaşma geçmişini gönder</translation>
+ </message>
+ <message>
+ <source>Previous message</source>
+ <translation>Önceki mesaj</translation>
+ </message>
+ <message>
+ <source>Next message</source>
+ <translation>Sonraki mesaj</translation>
+ </message>
+ <message>
+ <source>Previous message from all chats</source>
+ <translation>Bütün konuşmalardan önceki mesaj</translation>
+ </message>
+ <message>
+ <source>Next message from all chats</source>
+ <translation>Bütün konuşmalardan sonraki mesaj</translation>
+ </message>
+</context>
+</TS>
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org