thooge
/
keepassx1
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SettingsDlg

Browse Source 
git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@43 b624d157-de02-0410-bad0-e51aec6abb33
master
tariq 19 years ago
parent a1e30fef1c
commit 3341affdfc
5 changed files with 422 additions and 386 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 24
      src/dialogs/SettingsDlg.cpp
  2. 18
      src/forms/MainWindow.ui
  3. 88
      src/forms/SettingsDlg.ui
  4. 11
      src/mainwindow.cpp
  5. 1
      src/mainwindow.h

24
src/dialogs/SettingsDlg.cpp
Unescape View File

@ -30,17 +30,29 @@ CSettingsDlg::CSettingsDlg(QWidget* parent, const char* name, bool modal, Qt::WF
: QDialog(parent,name, modal,fl) : QDialog(parent,name, modal,fl)
{ {
setupUi(this); setupUi(this);
connect( ButtonOK, SIGNAL( clicked() ), this, SLOT( OnOK() ) );
connect( ButtonCancel, SIGNAL( clicked() ), this, SLOT( OnCancel() ) );
connect( ButtonColor1, SIGNAL( clicked() ), this, SLOT( OnColor1() ) );
connect( ButtonColor2, SIGNAL( clicked() ), this, SLOT( OnColor2() ) );
connect( ButtonTextColor, SIGNAL( clicked() ), this, SLOT( OnTextColor() ) );
createBanner(Banner,Icon_Settings32x32,trUtf8("Einstellungen")); createBanner(Banner,Icon_Settings32x32,trUtf8("Einstellungen"));
CheckBox_OpenLast->setChecked(config.OpenLast); CheckBox_OpenLast->setChecked(config.OpenLast);
SpinBox_ClipboardTime->setValue(config.ClipboardTimeOut); SpinBox_ClipboardTime->setValue(config.ClipboardTimeOut);
pixmTextColor->setPixmap(*(new QPixmap(pixmTextColor->width(),pixmTextColor->height())));
//pixmTextColor->pixmap()->fill(config.BannerTextColor);
pixmColor1->setPixmap(*(new QPixmap(pixmColor1->width(),pixmColor1->height()))); QPixmap *pxt=new QPixmap(pixmTextColor->width(),pixmTextColor->height());
//pixmColor1->pixmap()->fill(config.BannerColor1); pxt->fill(config.BannerTextColor);
pixmTextColor->clear();
pixmTextColor->setPixmap(*pxt);
QPixmap *px1=new QPixmap(pixmColor1->width(),pixmColor1->height());
px1->fill(config.BannerColor1);
pixmColor1->clear();
pixmColor1->setPixmap(*px1);
pixmColor2->setPixmap(*(new QPixmap(pixmColor2->width(),pixmColor2->height()))); QPixmap *px2=new QPixmap(pixmColor2->width(),pixmColor2->height());
//pixmColor2->pixmap()->fill(config.BannerColor2); px2->fill(config.BannerColor2);
pixmColor2->clear();
pixmColor2->setPixmap(*px2);
color1=config.BannerColor1; color1=config.BannerColor1;
color2=config.BannerColor2; color2=config.BannerColor2;

18
src/forms/MainWindow.ui
Unescape View File

@ -105,7 +105,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>724</width> <width>724</width>
<height>31</height> <height>30</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuHilfe" > <widget class="QMenu" name="menuHilfe" >
@ -138,11 +138,6 @@
<addaction name="separator" /> <addaction name="separator" />
<addaction name="FileExitAction" /> <addaction name="FileExitAction" />
</widget> </widget>
<widget class="QMenu" name="menuExtras" >
<property name="title" >
<string>Extras</string>
</property>
</widget>
<widget class="QMenu" name="menuBearbeiten" > <widget class="QMenu" name="menuBearbeiten" >
<property name="title" > <property name="title" >
<string>Bearbeiten</string> <string>Bearbeiten</string>
@ -192,6 +187,12 @@
<addaction name="separator" /> <addaction name="separator" />
<addaction name="menuSpalten" /> <addaction name="menuSpalten" />
</widget> </widget>
<widget class="QMenu" name="menuExtras" >
<property name="title" >
<string>Extras</string>
</property>
<addaction name="ExtrasSettingsAction" />
</widget>
<addaction name="menuDatei" /> <addaction name="menuDatei" />
<addaction name="menuBearbeiten" /> <addaction name="menuBearbeiten" />
<addaction name="menuAnsicht" /> <addaction name="menuAnsicht" />
@ -459,6 +460,11 @@
<string>Anhang</string> <string>Anhang</string>
</property> </property>
</action> </action>
<action name="ExtrasSettingsAction" >
<property name="text" >
<string>Einstellungen...</string>
</property>
</action>
</widget> </widget>
<pixmapfunction></pixmapfunction> <pixmapfunction></pixmapfunction>
<customwidgets> <customwidgets>

88
src/forms/SettingsDlg.ui
Unescape View File

@ -1,4 +1,4 @@
<ui version="4.0" stdsetdef="1" > <ui version="4.0" >
<author></author> <author></author>
<comment></comment> <comment></comment>
<exportmacro></exportmacro> <exportmacro></exportmacro>
@ -43,22 +43,6 @@
<string>Alt+C</string> <string>Alt+C</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="Banner" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>570</width>
<height>50</height>
</rect>
</property>
<property name="pixmap" >
<pixmap>image0</pixmap>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QPushButton" name="ButtonOK" > <widget class="QPushButton" name="ButtonOK" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
@ -75,13 +59,29 @@
<string>Alt+K</string> <string>Alt+K</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="Banner" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>570</width>
<height>50</height>
</rect>
</property>
<property name="pixmap" >
<pixmap/>
</property>
<property name="scaledContents" >
<bool>true</bool>
</property>
</widget>
<widget class="QTabWidget" name="tabWidget4" > <widget class="QTabWidget" name="tabWidget4" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>10</x> <x>10</x>
<y>60</y> <y>59</y>
<width>550</width> <width>550</width>
<height>240</height> <height>251</height>
</rect> </rect>
</property> </property>
<widget class="QWidget" name="tab" > <widget class="QWidget" name="tab" >
@ -93,7 +93,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>20</y> <y>20</y>
<width>180</width> <width>231</width>
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
@ -101,28 +101,28 @@
<string>Zwischenablage löschen nach:</string> <string>Zwischenablage löschen nach:</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="textLabel2" > <widget class="QSpinBox" name="SpinBox_ClipboardTime" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>280</x> <x>250</x>
<y>20</y> <y>20</y>
<width>100</width> <width>80</width>
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="text" >
<string>Sekunden</string>
</property>
</widget> </widget>
<widget class="QSpinBox" name="SpinBox_ClipboardTime" > <widget class="QLabel" name="textLabel2" >
<property name="geometry" > <property name="geometry" >
<rect> <rect>
<x>190</x> <x>340</x>
<y>20</y> <y>20</y>
<width>80</width> <width>100</width>
<height>20</height> <height>20</height>
</rect> </rect>
</property> </property>
<property name="text" >
<string>Sekunden</string>
</property>
</widget> </widget>
<widget class="QCheckBox" name="CheckBox_ShowPasswords" > <widget class="QCheckBox" name="CheckBox_ShowPasswords" >
<property name="geometry" > <property name="geometry" >
@ -137,7 +137,7 @@
<string>Passw&amp;örter standardmäßig in Klartext anzeigen</string> <string>Passw&amp;örter standardmäßig in Klartext anzeigen</string>
</property> </property>
<property name="shortcut" > <property name="shortcut" >
<string>Alt+ö</string> <string>Alt+Ö</string>
</property> </property>
</widget> </widget>
</widget> </widget>
@ -180,7 +180,7 @@
</rect> </rect>
</property> </property>
<property name="pixmap" > <property name="pixmap" >
<pixmap>image0</pixmap> <pixmap/>
</property> </property>
<property name="scaledContents" > <property name="scaledContents" >
<bool>true</bool> <bool>true</bool>
@ -199,7 +199,7 @@
<string>&amp;ändern...</string> <string>&amp;ändern...</string>
</property> </property>
<property name="shortcut" > <property name="shortcut" >
<string>Alt+ä</string> <string>Alt+Ä</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="textLabel3" > <widget class="QLabel" name="textLabel3" >
@ -225,7 +225,7 @@
</rect> </rect>
</property> </property>
<property name="pixmap" > <property name="pixmap" >
<pixmap>image0</pixmap> <pixmap/>
</property> </property>
<property name="scaledContents" > <property name="scaledContents" >
<bool>true</bool> <bool>true</bool>
@ -270,7 +270,7 @@
</rect> </rect>
</property> </property>
<property name="pixmap" > <property name="pixmap" >
<pixmap>image0</pixmap> <pixmap/>
</property> </property>
<property name="scaledContents" > <property name="scaledContents" >
<bool>true</bool> <bool>true</bool>
@ -306,7 +306,7 @@
<string>Gruppenbaum beim &amp;Öffnen aufklappen</string> <string>Gruppenbaum beim &amp;Öffnen aufklappen</string>
</property> </property>
<property name="shortcut" > <property name="shortcut" >
<string>Alt+ö</string> <string>Alt+Ö</string>
</property> </property>
</widget> </widget>
</widget> </widget>
@ -327,7 +327,7 @@
<string>zuletzt geöffnete Datei bei Programmstart &amp;öffnen</string> <string>zuletzt geöffnete Datei bei Programmstart &amp;öffnen</string>
</property> </property>
<property name="shortcut" > <property name="shortcut" >
<string>Alt+ö</string> <string>Alt+Ö</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="textLabel1_4" > <widget class="QLabel" name="textLabel1_4" >
@ -358,6 +358,15 @@
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11" />
<pixmapfunction></pixmapfunction> <pixmapfunction></pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3GroupBox</class>
<extends></extends>
<header>Qt3Support/Q3GroupBox</header>
<container>1</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops> <tabstops>
<tabstop>tabWidget4</tabstop> <tabstop>tabWidget4</tabstop>
<tabstop>SpinBox_ClipboardTime</tabstop> <tabstop>SpinBox_ClipboardTime</tabstop>
@ -370,9 +379,6 @@
<tabstop>ButtonOK</tabstop> <tabstop>ButtonOK</tabstop>
<tabstop>ButtonCancel</tabstop> <tabstop>ButtonCancel</tabstop>
</tabstops> </tabstops>
<images> <resources/>
<image name="image0" > <connections/>
<data format="XPM.GZ" length="4833" >789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8</data>
</image>
</images>
</ui> </ui>

11
src/mainwindow.cpp
Unescape View File

@ -111,6 +111,8 @@ void KeepassMainWindow::setupConnections(){
connect(ViewColumnsLastAccessAction,SIGNAL(toggled(bool)), this, SLOT(OnColumnVisibilityChanged(bool))); connect(ViewColumnsLastAccessAction,SIGNAL(toggled(bool)), this, SLOT(OnColumnVisibilityChanged(bool)));
connect(ViewColumnsAttachmentAction,SIGNAL(toggled(bool)), this, SLOT(OnColumnVisibilityChanged(bool))); connect(ViewColumnsAttachmentAction,SIGNAL(toggled(bool)), this, SLOT(OnColumnVisibilityChanged(bool)));
connect(ExtrasSettingsAction,SIGNAL(triggered(bool)),this,SLOT(OnExtrasSettings()));
connect(&ClipboardTimer, SIGNAL(timeout()), this, SLOT(OnClipboardTimeOut())); connect(&ClipboardTimer, SIGNAL(timeout()), this, SLOT(OnClipboardTimeOut()));
connect(GroupView,SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),this, connect(GroupView,SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),this,
SLOT(OnCurrentGroupChanged(QTreeWidgetItem*,QTreeWidgetItem*))); SLOT(OnCurrentGroupChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
@ -730,3 +732,12 @@ if(FileOpen){
else else
e->accept(); e->accept();
} }
void KeepassMainWindow::OnExtrasSettings(){
CSettingsDlg dlg(this,"SettingsDlg");
dlg.exec();
}

1
src/mainwindow.h
Unescape View File

@ -84,6 +84,7 @@ private slots:
void OnColumnVisibilityChanged(bool show); void OnColumnVisibilityChanged(bool show);
void OnUsernPasswVisibilityChanged(bool hide); void OnUsernPasswVisibilityChanged(bool hide);
void OnFileModified(); void OnFileModified();
void OnExtrasSettings();
private: private:
enum SelectionState{NONE,SINGLE,MULTIPLE,SEARCHGROUP}; enum SelectionState{NONE,SINGLE,MULTIPLE,SEARCHGROUP};