diff options
Diffstat (limited to 'src/modules/reguser')
| -rw-r--r-- | src/modules/reguser/dialog.cpp | 34 | ||||
| -rw-r--r-- | src/modules/reguser/dialog.h | 16 | ||||
| -rw-r--r-- | src/modules/reguser/edituser.cpp | 24 | ||||
| -rw-r--r-- | src/modules/reguser/edituser.h | 14 | ||||
| -rw-r--r-- | src/modules/reguser/reguser_QT4_vc05.vcproj | 586 | ||||
| -rw-r--r-- | src/modules/reguser/wizard.cpp | 19 |
6 files changed, 386 insertions, 307 deletions
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index 0b8d5506e..617d28677 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -42,7 +42,15 @@ #include <qlayout.h> #include <qlabel.h> +#ifdef COMPILE_USE_QT4 +#include <Q3Header> +#include <QCloseEvent> +#include <QImageWriter> +#include <QImageReader> + +#else #include <qheader.h> +#endif #include "kvi_asciidict.h" #include <qimage.h> #include <qstring.h> @@ -329,7 +337,7 @@ void KviRegisteredUsersDialog::itemPressed(KviTalListViewItem *it,const QPoint & if((c == 1) && (ppp.x() < (r.height() + 5 + daw))) { // notify list toggle - if(i->user()->getProperty("notify")) + if(i->user()->getProperty("notify").isEmpty()) { i->user()->setProperty("notify",""); // kill that } else { @@ -660,8 +668,8 @@ void KviRegisteredUsersDialog::exportClicked() { unsigned int nEntries = 0; - KviTalListViewItemIterator it( m_pListView, QListViewItemIterator::Selected ); - KviTalListViewItemIterator cit( m_pListView, QListViewItemIterator::Selected ); + KviTalListViewItemIterator it( m_pListView, KviTalListViewItemIterator::Selected ); + KviTalListViewItemIterator cit( m_pListView, KviTalListViewItemIterator::Selected ); while ( cit.current() ) { if(((KviRegisteredUsersDialogItemBase *)(cit.current()))->type() == KviRegisteredUsersDialogItemBase::User) nEntries++; @@ -741,11 +749,18 @@ void KviRegisteredUsersDialog::exportClicked() if(!av->pixmap()->isNull()) { if(!f.save(1))goto write_error; +#ifdef COMPILE_USE_QT4 + QImageWriter io; + io.setDevice(&f); + io.setFormat("PNG"); + if(!io.write(av->pixmap()->convertToImage()))goto write_error; +#else QImageIO io; io.setImage(av->pixmap()->convertToImage()); io.setIODevice(&f); io.setFormat("PNG"); if(!io.write())goto write_error; +#endif } else { if(!f.save(0))goto write_error; } @@ -838,8 +853,16 @@ void KviRegisteredUsersDialog::importClicked() if(count) { // there is an avatar - QImageIO io; QImage img; +#ifdef COMPILE_USE_QT4 + QImageReader io; + io.setDevice(&f); + io.setFormat("PNG"); + img=io.read(); +// if(io.read())goto read_error; + +#else + QImageIO io; io.setImage(img); io.setIODevice(&f); io.setFormat("PNG"); @@ -847,7 +870,7 @@ void KviRegisteredUsersDialog::importClicked() if(!io.read())goto read_error; img = io.image(); - +#endif if(img.isNull())debug("Ops.. readed a null image ?"); KviStr fName = u->name(); @@ -884,3 +907,4 @@ succesfull_import: f.close(); fillList(); } +#include "dialog.moc"
\ No newline at end of file diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h index 6b3a7d409..c5c933fc4 100644 --- a/src/modules/reguser/dialog.h +++ b/src/modules/reguser/dialog.h @@ -34,13 +34,17 @@ #include "kvi_tal_listbox.h" #include "kvi_dict.h" #include "kvi_tal_popupmenu.h" -#include <qintdict.h> - #ifdef COMPILE_USE_QT4 + #include <Q3IntDict> + + #include <q3simplerichtext.h> #define QSimpleRichText Q3SimpleRichText #else #include <qsimplerichtext.h> + #include <qintdict.h> + + #endif class KviRegisteredUsersDialogItemBase : public KviTalListViewItem @@ -113,9 +117,13 @@ public: QPushButton * m_pImportButton; QPushButton * m_pExportButton; QPushButton * m_pAddGroupButton; - +#ifdef COMPILE_USE_QT4 + Q3IntDict<KviRegisteredUserGroup> m_TmpDict; +#else QIntDict<KviRegisteredUserGroup> m_TmpDict; -protected slots: +#endif + + protected slots: void itemPressed(KviTalListViewItem *it,const QPoint &pnt,int c); void itemDoubleClicked(KviTalListViewItem *it); protected: diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index eb5857538..b366c4c3a 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -43,7 +43,13 @@ #include <qlayout.h>
#include <qlabel.h>
+#ifdef COMPILE_USE_QT4
+#include <QCloseEvent>
+#include <Q3Header>
+#include <Q3Vbox>
+#else
#include <qheader.h>
+#endif
#include "kvi_asciidict.h"
#include <qimage.h>
#include <qstring.h>
@@ -81,11 +87,15 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviDict<QStri QGridLayout * g = new QGridLayout(this,3,3,4,4);
+#ifdef COMPILE_USE_QT4
+ m_pTable = new Q3Table(this);
+#else
m_pTable = new QTable(this);
+#endif
g->addMultiCellWidget(m_pTable,0,1,0,1);
m_pTable->setNumCols(2);
- m_pTable->setSelectionMode(QTable::NoSelection);
+ m_pTable->setSelectionMode(Kvi_Tal_Table::NoSelection);
m_pTable->horizontalHeader()->setLabel(0,__tr2qs("Property"));
m_pTable->horizontalHeader()->setLabel(1,__tr2qs("Value"));
@@ -141,8 +151,8 @@ void KviReguserPropertiesDialog::fillData() int row = 0;
while(it.current())
{
- m_pTable->setItem(row,0,new QTableItem(m_pTable,QTableItem::OnTyping,it.currentKey()));
- m_pTable->setItem(row,1,new QTableItem(m_pTable,QTableItem::OnTyping,*(it.current())));
+ m_pTable->setItem(row,0,new Kvi_Tal_TableItem(m_pTable,Kvi_Tal_TableItem::OnTyping,it.currentKey()));
+ m_pTable->setItem(row,1,new Kvi_Tal_TableItem(m_pTable,Kvi_Tal_TableItem::OnTyping,*(it.current())));
++row;
++it;
}
@@ -171,8 +181,8 @@ void KviReguserPropertiesDialog::okClicked() void KviReguserPropertiesDialog::addClicked()
{
m_pTable->setNumRows(m_pTable->numRows() + 1);
- m_pTable->setItem(m_pTable->numRows() - 1,0,new QTableItem(m_pTable,QTableItem::OnTyping,""));
- m_pTable->setItem(m_pTable->numRows() - 1,1,new QTableItem(m_pTable,QTableItem::OnTyping,""));
+ m_pTable->setItem(m_pTable->numRows() - 1,0,new Kvi_Tal_TableItem(m_pTable,Kvi_Tal_TableItem::OnTyping,""));
+ m_pTable->setItem(m_pTable->numRows() - 1,1,new Kvi_Tal_TableItem(m_pTable,Kvi_Tal_TableItem::OnTyping,""));
m_pDelButton->setEnabled(true);
}
@@ -437,7 +447,11 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste addTab(p2,__tr2qs("Properties"));
// Ignore TAB
+#ifdef COMPILE_USE_QT4
+ Q3VBox * vb = new Q3VBox(this);
+#else
QVBox * vb = new QVBox(this);
+#endif
vb->setMargin(10);
m_pIgnoreEnabled = new KviStyledCheckBox(__tr2qs("Enable ignore for this user"),vb);
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h index 6c017a08e..09be2913a 100644 --- a/src/modules/reguser/edituser.h +++ b/src/modules/reguser/edituser.h @@ -35,7 +35,17 @@ #include "kvi_tal_listbox.h" #include "kvi_dict.h" #include <kvi_tal_tabdialog.h> +#ifdef COMPILE_USE_QT4 +#include <Q3Table> +#define Kvi_Tal_Table Q3Table +#define Kvi_Tal_TableItem Q3TableItem + +#else #include <qtable.h> +#define Kvi_Tal_Table QTable +#define Kvi_Tal_TableItem QTableItem + +#endif #include "kvi_tal_popupmenu.h" #ifndef _EDITUSER_CPP_ @@ -51,7 +61,11 @@ public: KviReguserPropertiesDialog(QWidget *p,KviDict<QString> * dict); ~KviReguserPropertiesDialog(); protected: +#ifdef COMPILE_USE_QT4 + Q3Table *m_pTable; +#else QTable * m_pTable; +#endif KviDict<QString> * m_pPropertyDict; QPushButton * m_pDelButton; QPushButton * m_pAddButton; diff --git a/src/modules/reguser/reguser_QT4_vc05.vcproj b/src/modules/reguser/reguser_QT4_vc05.vcproj index 84fe48d0f..bf3cc8633 100644 --- a/src/modules/reguser/reguser_QT4_vc05.vcproj +++ b/src/modules/reguser/reguser_QT4_vc05.vcproj @@ -1,286 +1,302 @@ <?xml version="1.0" encoding="Windows-1252"?>
- <VisualStudioProject
- ProjectType="Visual C++"
- Version="8,00"
- Name="reguser"
- ProjectGUID="{12DB9879-4F34-4EFC-8415-8714224CDDF4}"
- RootNamespace="reguser"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)\win32build\bin\modules\"
- IntermediateDirectory="Debug"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="4"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="qtmain.lib libeay32.lib SSLeay32.lib ws2_32.lib kvilib.lib kvirc.lib msvcrt.lib perl58.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib qt3supportd4.lib qtcored4.lib qtnetworkd4.lib qtguid4.lib "
- OutputFile="$(OutDir)/kvi$(ProjectName).dll"
- LinkIncremental="2"
- AdditionalLibraryDirectories=""$(SSLLIBDIR)";"$(PERLDIR)\lib\CORE";"$(QTDIR)\lib";"$(SolutionDir)\win32build\bin";"$(ZLIBLIBDIR)""
- GenerateManifest="true"
- IgnoreAllDefaultLibraries="true"
- GenerateDebugInformation="true"
- ProgramDatabaseFile="$(OutDir)/reguser.pdb"
- SubSystem="2"
- TurnOffAssemblyGeneration="true"
- ImportLibrary="$(OutDir)/reguser.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- AdditionalManifestFiles="$(SolutionDir)/data/manifests/commctrl.manifest"
- EmbedManifest="true"
- VerboseOutput="true"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)\win32build\bin\modules"
- IntermediateDirectory="Release"
- ConfigurationType="2"
- InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="1"
- InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="true"
- FavorSizeOrSpeed="1"
- OmitFramePointers="true"
- EnableFiberSafeOptimizations="true"
- WholeProgramOptimization="true"
- AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
- StringPooling="true"
- MinimalRebuild="true"
- ExceptionHandling="1"
- RuntimeLibrary="0"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="qtmain.lib libeay32.lib SSLeay32.lib ws2_32.lib kvilib.lib kvirc.lib msvcrt.lib perl58.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib qt3support4.lib qtcore4.lib qtnetwork4.lib qtgui4.lib "
- OutputFile="$(OutDir)/kvi$(ProjectName).dll"
- LinkIncremental="1"
- AdditionalLibraryDirectories=""$(SSLLIBDIR)";"$(PERLDIR)\lib\CORE";"$(QTDIR)\lib";"$(SolutionDir)\win32build\bin";"$(ZLIBLIBDIR)""
- GenerateManifest="true"
- IgnoreAllDefaultLibraries="true"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- OptimizeForWindows98="1"
- LinkTimeCodeGeneration="1"
- TurnOffAssemblyGeneration="true"
- ImportLibrary="$(OutDir)/reguser.lib"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- AdditionalManifestFiles="$(SolutionDir)/data/manifests/commctrl.manifest"
- EmbedManifest="false"
- VerboseOutput="true"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
- Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
- >
- <File
- RelativePath=".\edituser.cpp"
- >
- </File>
- <File
- RelativePath=".\libkvireguser.cpp"
- >
- </File>
- <File
- RelativePath=".\wizard.cpp"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;inc;xsd"
- UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
- >
- <File
- RelativePath=".\edituser.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- </File>
- <File
- RelativePath=".\wizard.h"
- >
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCustomBuildTool"
- CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
- Outputs="$(InputDir)\$(InputName).moc"
- />
- </FileConfiguration>
- </File>
- </Filter>
- <Filter
- Name="Resource Files"
- Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
- </VisualStudioProject>
- +<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8,00"
+ Name="reguser"
+ ProjectGUID="{12DB9879-4F34-4EFC-8415-8714224CDDF4}"
+ RootNamespace="reguser"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)\win32build\bin\modules\"
+ IntermediateDirectory="Debug"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="1"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="qtmain.lib libeay32.lib SSLeay32.lib ws2_32.lib kvilib.lib kvirc.lib msvcrt.lib perl58.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib qt3supportd4.lib qtcored4.lib qtnetworkd4.lib qtguid4.lib "
+ OutputFile="$(OutDir)/kvi$(ProjectName).dll"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories=""$(SSLLIBDIR)";"$(PERLDIR)\lib\CORE";"$(QTDIR)\lib";"$(SolutionDir)\win32build\bin";"$(ZLIBLIBDIR)""
+ GenerateManifest="true"
+ IgnoreAllDefaultLibraries="true"
+ GenerateDebugInformation="true"
+ ProgramDatabaseFile="$(OutDir)/reguser.pdb"
+ SubSystem="2"
+ TurnOffAssemblyGeneration="true"
+ ImportLibrary="$(OutDir)/reguser.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ AdditionalManifestFiles="$(SolutionDir)/data/manifests/commctrl.manifest"
+ EmbedManifest="true"
+ VerboseOutput="true"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(SolutionDir)\win32build\bin\modules"
+ IntermediateDirectory="Release"
+ ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="1"
+ InlineFunctionExpansion="2"
+ EnableIntrinsicFunctions="true"
+ FavorSizeOrSpeed="1"
+ OmitFramePointers="true"
+ EnableFiberSafeOptimizations="true"
+ WholeProgramOptimization="true"
+ AdditionalIncludeDirectories=""$(ProjectDir)\..\..\kvirc\module";"$(ProjectDir)\..\..\kvilib\config";"$(QTDIR)\include";"$(ProjectDir)\..\..\kvilib\core";"$(ProjectDir)\..\..\kvilib\system";"$(ProjectDir)\..\..\kvirc\uparser";"$(ProjectDir)\..\..\kvilib\ext";"$(ProjectDir)\..\..\kvirc\kvs";"$(ProjectDir)\..\..\kvirc\ui";"$(ProjectDir)\..\..\kvirc\kernel";"$(ProjectDir)\..\..\kvilib\tal";"$(ProjectDir)\..\..\kvilib\irc";"$(ProjectDir)\..\..\kvilib\file";"$(QTDIR)\include\Qt3Support";"$(QTDIR)\include\QtCore\";"$(QTDIR)\include\QtGui";"$(QTDIR)\include\Qt";"$(QTDIR)\include\QtNetwork";"$(QTDIR)\include\QtXml";"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;REGUSER_EXPORTS;_CRT_SECURE_NO_DEPRECATE;QT3_SUPPORT;"
+ StringPooling="true"
+ MinimalRebuild="true"
+ ExceptionHandling="1"
+ RuntimeLibrary="0"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="qtmain.lib libeay32.lib SSLeay32.lib ws2_32.lib kvilib.lib kvirc.lib msvcrt.lib perl58.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib qt3support4.lib qtcore4.lib qtnetwork4.lib qtgui4.lib "
+ OutputFile="$(OutDir)/kvi$(ProjectName).dll"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories=""$(SSLLIBDIR)";"$(PERLDIR)\lib\CORE";"$(QTDIR)\lib";"$(SolutionDir)\win32build\bin";"$(ZLIBLIBDIR)""
+ GenerateManifest="true"
+ IgnoreAllDefaultLibraries="true"
+ GenerateDebugInformation="true"
+ SubSystem="2"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
+ OptimizeForWindows98="1"
+ LinkTimeCodeGeneration="1"
+ TurnOffAssemblyGeneration="true"
+ ImportLibrary="$(OutDir)/reguser.lib"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ AdditionalManifestFiles="$(SolutionDir)/data/manifests/commctrl.manifest"
+ EmbedManifest="false"
+ VerboseOutput="true"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath=".\dialog.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\edituser.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\libkvireguser.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\wizard.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath=".\dialog.h"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)""
+ Outputs="$(InputDir)\$(InputName).moc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\edituser.h"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
+ Outputs="$(InputDir)\$(InputName).moc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
+ Outputs="$(InputDir)\$(InputName).moc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath=".\wizard.h"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
+ Outputs="$(InputDir)\$(InputName).moc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="$(QTDIR)\bin\moc -o "$(InputDir)\$(InputName).moc" "$(InputDir)\$(InputFileName)"
"
+ Outputs="$(InputDir)\$(InputName).moc"
+ />
+ </FileConfiguration>
+ </File>
+ </Filter>
+ <Filter
+ Name="Resource Files"
+ Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+ UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index ec6c5a544..6fefff089 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -31,6 +31,9 @@ #include "kvi_pixmap.h" #include "kvi_regusersdb.h" #include "kvi_iconmanager.h" +#ifdef COMPILE_USE_QT4 +#include <QDesktopWidget> +#endif #include <qcheckbox.h> #include <qlabel.h> @@ -115,13 +118,13 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere //KviIrcMask masktempl(szMask.ptr()); m_pNicknameEdit1 = new QLineEdit(m_pPage2); - m_pNicknameEdit1->setAlignment(int(QLineEdit::AlignRight)); + m_pNicknameEdit1->setAlignment(Qt::AlignRight); if(mask.nick() != "*")m_pNicknameEdit1->setText(mask.nick()); connect(m_pNicknameEdit1,SIGNAL(textChanged(const QString &)),this,SLOT(maskChanged(const QString &))); m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 ); m_pUsernameEdit1 = new QLineEdit(m_pPage2); - m_pUsernameEdit1->setAlignment(int(QLineEdit::AlignHCenter)); + m_pUsernameEdit1->setAlignment(Qt::AlignHCenter); if(mask.hasUser())m_pUsernameEdit1->setText(mask.user()); connect(m_pUsernameEdit1,SIGNAL(textChanged(const QString &)),this,SLOT(maskChanged(const QString &))); m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2); @@ -132,11 +135,11 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere m_pPage2Layout->addWidget(m_pHostEdit1,1,4); m_pNicknameEdit2 = new QLineEdit(m_pPage2); - m_pNicknameEdit2->setAlignment(int(QLineEdit::AlignRight)); + m_pNicknameEdit2->setAlignment(Qt::AlignRight); m_pPage2Layout->addWidget(m_pNicknameEdit2,2,0); m_pUsernameEdit2 = new QLineEdit(m_pPage2); - m_pUsernameEdit2->setAlignment(int(QLineEdit::AlignHCenter)); + m_pUsernameEdit2->setAlignment(Qt::AlignHCenter); m_pPage2Layout->addWidget(m_pUsernameEdit2,2,2); m_pHostEdit2 = new QLineEdit(m_pPage2); @@ -144,22 +147,22 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere TextLabel10_2 = new QLabel(m_pPage2); TextLabel10_2->setText("<center><b>!</b></center>"); - TextLabel10_2->setAlignment(int(QLabel::AlignCenter)); + TextLabel10_2->setAlignment(int(Qt::AlignCenter)); m_pPage2Layout->addWidget(TextLabel10_2,2,1); TextLabel10 = new QLabel(m_pPage2); TextLabel10->setText("<center><b>!</b></center>"); - TextLabel10->setAlignment(int(QLabel::AlignCenter)); + TextLabel10->setAlignment(int(Qt::AlignCenter)); m_pPage2Layout->addWidget(TextLabel10,1,1); TextLabel10_3 = new QLabel(m_pPage2); TextLabel10_3->setText("<center><b>@</b></center>"); - TextLabel10_3->setAlignment(int(QLabel::AlignCenter)); + TextLabel10_3->setAlignment(int(Qt::AlignCenter)); m_pPage2Layout->addWidget(TextLabel10_3,1,3); TextLabel10_3_2 = new QLabel(m_pPage2); TextLabel10_3_2->setText("<center><b>@</b></center>"); - TextLabel10_3_2->setAlignment(int(QLabel::AlignCenter)); + TextLabel10_3_2->setAlignment(int(Qt::AlignCenter)); m_pPage2Layout->addWidget(TextLabel10_3_2,2,3); addPage(m_pPage2,__tr2qs("Step 2: Mask Selection")); |