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

List:       kde-core-devel
Subject:    kdelibs/kdewidgets
From:       Ian Reinhart Geiser <geiseri () kde ! org>
Date:       2004-02-08 0:00:08
Message-ID: 20040208000008.71A289135 () office ! kde ! org
[Download RAW message or body]

CVS commit by geiseri: 

Removed the old perl script.

Added a new C++ version of the script that is mostly the same but with
the noted changes:
	* The input file is a correctly formed KDE ini style file
	* The binary makekdewidgets is installed to the system for
	  general use.
Added tests that ensure the output is correct for building with
the API TrollTech has defined for building widget plugins.

Updated the kde.widgets file to reflect the new format.  Basicly
the first 5 lines where modified slightly.

Updated the README file to reflect the changed options.  Functionaly
its operation is identical to the old perl version, but it has an
option to embed pixmaps.  This is handy if someone wishes to write
a GUI plugin that will work with Qt only.

Some things to note.  People may have problems building this stuff if
they have stale files laying arround.  This has been tested with 
unsermake, without unsermake and both builddir != srcdir and builddir
== srcdir.  Chances are if there is a problem with this code its your
local system.  So before you "fix" any thing please forward the patch
to me to ensure your not breaking things for everyone else.

This program will be for general use, and I will have a complete howto
posted shortly.  Ideally we can now add widget plugins for KOffice, and
kde-edu next ;)

CCMAIL: kde-core-devel@kde.org


  A            makekdewidgets.cpp   1.1 [GENERATED FILE]
  A            tests/Makefile.am   1.1
  A            tests/README   1.1
  A            tests/sums   1.1
  A            tests/test.widgets   1.1
  M +12 -6     Makefile.am   1.21
  M +11 -3     README   1.8
  M +10 -6     kde.widgets   1.30
  R            makekdewidgets   1.4


--- kdelibs/kdewidgets/Makefile.am  #1.20:1.21
@@ -19,16 +19,22 @@
 #    Boston, MA 02111-1307, USA.
 
-SUBDIRS=. pics
+SUBDIRS=. pics tests
 AM_CXXFLAGS = -DQT_PLUGIN
 
 INCLUDES = -I$(top_srcdir)/kfile $(all_includes)
+
+bin_PROGRAMS = makekdewidgets
+makekdewidgets_SOURCES = makekdewidgets.cpp
+makekdewidgets_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+makekdewidgets_LDADD = $(LIB_QT) ../kdecore/libkdecore.la 
+
 kde_widget_LTLIBRARIES = kdewidgets.la
-kdewidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kdewidgets_la_LIBADD = $(LIB_KIO)
+kdewidgets_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries)
+kdewidgets_la_LIBADD = $(LIB_KIO) $(LIB_KABC)
 kdewidgets_la_SOURCES = classpreviews.cpp kdewidgets.cpp
 
-kdewidgets.cpp: kde.widgets
-        $(srcdir)/makekdewidgets -o $(top_builddir)/kdewidgets/kdewidgets.cpp $<
+kdewidgets.cpp: kde.widgets makekdewidgets
+        ./makekdewidgets -o kdewidgets.cpp $<
 
-CLEANFILES = $(srcdir)/kdewidgets.cpp
+CLEANFILES = kdewidgets.cpp
 

--- kdelibs/kdewidgets/README  #1.7:1.8
@@ -45,11 +45,19 @@
 Group defaults to "KDE"
 
-If you somehow need extra includes in kdewidgets.cpp, add them to the
-[Includes] section, additional code for the plugin constructor goes
-to [Init], code for the destructor to [Destroy]
+There are some global options that you can have.
+
+[Global]
+Init=new InitCode();
+Destroy= delete object;
+PluginName=MyPlugin
+
+PluginName overrides the passed in value at the command line and is optional.
+Init and Destroy are both optional arguments that can be used for custom build
+up and tear down code.
 
 Have fun!
 
 
+Ian Reinhart Geiser <geiseri@kde.org>
 Daniel Molkentin <molkentin@kde.org>
 Malte Starostik <malte@kde.org>

--- kdelibs/kdewidgets/kde.widgets  #1.29:1.30
@@ -1,8 +1,6 @@
-[Includes]
-kinstance.h
-classpreviews.h
-
-[Init]
-new KInstance("kdewidgets");
+[Global]
+PluginName=KDEWidgets
+Includes=kinstance.h,classpreviews.h
+Init=new KInstance("kdewidgets");
 
 [KActiveLabel]
@@ -262,2 +260,8 @@
 Group=Display (KDE)
 ConstructorArgs=(parent, 210, 16)
+
+[KABC::AddressLineEdit]
+IncludeFile=kabc/addresslineedit.h
+ToolTip=A lineedit with LDAP and kabc completion.
+Group=Input (KDE)
+ConstructorArgs=(parent, true, name)


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