basket.qrc @@ -1,7 +1,6 @@ include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${QIMAGEBLITZ_INCLUDES} ${GPGME_INCLUDES}) - ########### next target ############### set(basketcommon_LIB_SRCS @@ -50,6 +49,8 @@ kde4_add_ui_files(basketcommon_LIB_SRCS passwordlayout.ui) QT4_ADD_DBUS_ADAPTOR(basketcommon_LIB_SRCS org.basket.BNPView.xml bnpview.h BNPView) +QT4_ADD_RESOURCES(basketcommon_LIB_SRCS ../basket.qrc) + kde4_add_library(basketcommon SHARED ${basketcommon_LIB_SRCS}) target_link_libraries(basketcommon src/CMakeLists.txt @@ -48,7 +48,7 @@ #include <kshortcutwidget.h> #include <QFontComboBox> -#include <Qt3Support> +//#include <Qt3Support> #include "kicondialog.h" #include "tag.h" @@ -512,15 +512,16 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT font.setFamily("monospace"); m_textEquivalent->setFont(font); - QPixmap textEquivalentPixmap(KGlobal::dirs()->findResource("data", "basket/images/tag_export_help.png")); - Q3MimeSourceFactory::defaultFactory()->setPixmap("__resource_help_tag_export.png", textEquivalentPixmap); + //QPixmap textEquivalentPixmap(KGlobal::dirs()->findResource("data", "basket/images/tag_export_help.png")); + //Q3MimeSourceFactory::defaultFactory()->setPixmap("__resource_help_tag_export.png", textEquivalentPixmap); HelpLabel *textEquivalentHelp = new HelpLabel( - i18n("When does this apply?"), - "<p>" + i18n("It does apply when you copy and paste, or drag and drop notes to a text editor.") + "</p>" + - "<p>" + i18n("If filled, this property lets you paste this tag or this state as textual equivalent.") + "<br>" + + i18n("What is this for?"), + "<p>" + i18n("When you copy and paste or drag and drop notes to a text editor, this text will be inserted as a textual equivalent of the tag.") + "</p>" + +// "<p>" + i18n("If filled, this property lets you paste this tag or this state as textual equivalent.") + "<br>" + i18n("For instance, a list of notes with the <b>To Do</b> and <b>Done</b> tags are exported as lines preceded by <b>[ ]</b> or <b>[x]</b>, " "representing an empty checkbox and a checked box.") + "</p>" + - "<p align='center'><img src=\"__resource_help_tag_export.png\"></p>", + //"<p align='center'><img src=\"__resource_help_tag_export.png\"></p>", + "<p align='center'><img src=\":images/tag_export_help.png\"></p>", stateWidget); QHBoxLayout *textEquivalentHelpLayout = new QHBoxLayout((QWidget*)0, /*border=*/0, spacingHint()); textEquivalentHelpLayout->addWidget(textEquivalentHelp); @@ -528,12 +529,13 @@ TagsEditDialog::TagsEditDialog(QWidget *parent, State *stateToEdit, bool addNewT m_onEveryLines = new QCheckBox(i18n("On ever&y line"), stateWidget); - QPixmap onEveryLinesPixmap(KGlobal::dirs()->findResource("data", "basket/images/tag_export_on_every_lines_help.png")); - Q3MimeSourceFactory::defaultFactory()->setPixmap("__resource_help_tag_export_on_every_lines.png", onEveryLinesPixmap); + //QPixmap onEveryLinesPixmap(KGlobal::dirs()->findResource("data", "basket/images/tag_export_on_every_lines_help.png")); + //Q3MimeSourceFactory::defaultFactory()->setPixmap("__resource_help_tag_export_on_every_lines.png", onEveryLinesPixmap); HelpLabel *onEveryLinesHelp = new HelpLabel( - i18n("What does it mean?"), + i18n("What does this mean?"), "<p>" + i18n("When a note has several lines, you can choose to export the tag or the state on the first line or on every line of the note.") + "</p>" + - "<p align='center'><img src=\"__resource_help_tag_export_on_every_lines.png\"></p>" + + //"<p align='center'><img src=\"__resource_help_tag_export_on_every_lines.png\"></p>" + + "<p align='center'><img src=\":images/tag_export_on_every_lines_help.png\"></p>" + "<p>" + i18n("In the example above, the tag of the top note is only exported on the first line, while the tag of the bottom note is exported on every line of the note."), stateWidget); QHBoxLayout *onEveryLinesHelpLayout = new QHBoxLayout((QWidget*)0, /*border=*/0, spacingHint()); src/tagsedit.cpp 32e24af01f277c998e80322f9a5c694adb1942c3 Dr. Robert Marmorstein robert@narnia.homeunix.com http://github.com/kelvie/basket/commit/cbc3b67df98fdfe56d8d2cc2e6e9b5c063e6fb70 cbc3b67df98fdfe56d8d2cc2e6e9b5c063e6fb70 2008-08-09T21:20:46-07:00 2008-08-04T10:01:56-07:00 Replaced ugly Q3MimeSourceFactory stuff with Qt4 resources. This required some minor changes to the CMakeLists.txt file. New resources can be added by simply modifying the "basket.qrc" file. 16ba0fce109a7bdb84f326926aa7fe7b072d3c37 Kelvie Wong kelvie@ieee.org