[Digikam-devel] extragear/graphics/digikamimageplugins/inserttext

[Gilles Caulier]

SVN commit 442421 by cgilles:

digiKam InsertText tool : add embedded KontChooser implementation like new widget named FontChooserWidget. This widget have been simplified to reduce dialog plugin size (compatible with low screen size).

CCMAIL: digikam-devel at kde.org

 M  +1 -1      Makefile.am  
 A             fontchooserwidget.cpp   [License: GPL]
 A             fontchooserwidget.h   [License: GPL]
 M  +3 -2      imageeffect_inserttext.cpp  
 M  +12 -12    imageeffect_inserttext.h  


--- trunk/extragear/graphics/digikamimageplugins/inserttext/Makefile.am #442420:442421
@@ -10,7 +10,7 @@
 
 digikamimageplugin_inserttext_la_SOURCES = imageplugin_inserttext.cpp \
 	                                   imageeffect_inserttext.cpp \
-					   inserttextwidget.cpp 
+	                                   inserttextwidget.cpp fontchooserwidget.cpp 
 
 digikamimageplugin_inserttext_la_LIBADD = $(LIB_KPARTS) $(LIBDIGIKAM_LIBS) \
 	              $(top_builddir)/digikamimageplugins/common/dialogs/libdigikamimagepluginsdialog.la 
--- trunk/extragear/graphics/digikamimageplugins/inserttext/imageeffect_inserttext.cpp #442420:442421
@@ -51,7 +51,6 @@
 #include <kstandarddirs.h>
 #include <kconfig.h>
 #include <kcolorbutton.h>
-#include <kfontdialog.h>
 #include <ktextedit.h> 
 
 // Digikam includes.
@@ -62,6 +61,7 @@
 
 #include "version.h"
 #include "inserttextwidget.h"
+#include "fontchooserwidget.h"
 #include "imageeffect_inserttext.h"
 
 namespace DigikamInsertTextImagesPlugin
@@ -113,7 +113,8 @@
     
     // -------------------------------------------------------------
     
-    m_fontChooserWidget = new KFontChooser(gbox2, 0L, false, QStringList(), false);
+    m_fontChooserWidget = new FontChooserWidget(gbox2, 0L, false, QStringList(), false);
+    QWhatsThis::add( m_textEdit, i18n("<p>Here you can choose the font to be used."));
     gridBox2->addMultiCellWidget(m_fontChooserWidget, 3, 3, 0, 1);
     
     // -------------------------------------------------------------
--- trunk/extragear/graphics/digikamimageplugins/inserttext/imageeffect_inserttext.h #442420:442421
@@ -39,13 +39,13 @@
 class QCheckBox;
 
 class KTextEdit;
-class KFontChooser;
 class KColorButton;
 
 namespace DigikamInsertTextImagesPlugin
 {
 
 class InsertTextWidget;
+class FontChooserWidget;
 
 class ImageEffect_InsertText : public DigikamImagePlugins::ImageDialogBase
 {
@@ -58,25 +58,25 @@
 
 private:
     
-    int               m_alignTextMode;
-    int               m_defaultSizeFont;
+    int                m_alignTextMode;
+    int                m_defaultSizeFont;
         
-    QComboBox        *m_textRotation;
+    QComboBox         *m_textRotation;
     
-    QCheckBox        *m_borderText;    
-    QCheckBox        *m_transparentText;
+    QCheckBox         *m_borderText;    
+    QCheckBox         *m_transparentText;
     
-    QHButtonGroup    *m_alignButtonGroup;
+    QHButtonGroup     *m_alignButtonGroup;
         
-    QFont             m_textFont;
+    QFont              m_textFont;
     
-    KColorButton     *m_fontColorButton;
+    KColorButton      *m_fontColorButton;
     
-    KFontChooser     *m_fontChooserWidget;
+    FontChooserWidget *m_fontChooserWidget;
     
-    KTextEdit        *m_textEdit;
+    KTextEdit         *m_textEdit;
     
-    InsertTextWidget *m_previewWidget;
+    InsertTextWidget  *m_previewWidget;
 
 private: