minor gui fixes

This commit is contained in:
Christian Hohnstaedt 2011-07-08 18:45:39 +02:00
parent 72840d483a
commit e33eb7e076
4 changed files with 48 additions and 59 deletions

View File

@ -19,7 +19,7 @@ ui_%.h: %.ui
$(UIC) -o $@ $<
# default compile rule
%.o: %.cpp .depend
%.o: %.cpp
$(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
.depend: $(SRCS)

View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>532</width>
<height>428</height>
<height>438</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
@ -235,31 +235,35 @@
</widget>
</item>
<item>
<widget class="CopyLabel" name="keyModulus">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<widget class="QTextBrowser" name="keyModulus">
<property name="font">
<font>
<family>Monospace</family>
</font>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum>
</property>
<property name="acceptRichText">
<bool>false</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
</property>
<property name="openLinks">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>17</width>
<height>57</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">

View File

@ -7,13 +7,10 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>260</height>
<height>258</height>
</rect>
</property>
<property name="windowTitle">
<string>Password</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout">
<property name="spacing">
@ -75,13 +72,16 @@
</layout>
</item>
<item>
<widget class="QLabel" name="description">
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
<widget class="QWidget" name="widget" native="true">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="description">
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
@ -128,6 +128,9 @@
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
@ -135,28 +138,8 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>passA</tabstop>
<tabstop>passB</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>passB</sender>
<signal>returnPressed()</signal>
<receiver>PwDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>238</x>
<y>159</y>
</hint>
<hint type="destinationlabel">
<x>252</x>
<y>42</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>clicked(QAbstractButton*)</signal>
@ -164,12 +147,12 @@
<slot>buttonPress(QAbstractButton*)</slot>
<hints>
<hint type="sourcelabel">
<x>113</x>
<y>231</y>
<x>63</x>
<y>221</y>
</hint>
<hint type="destinationlabel">
<x>125</x>
<y>53</y>
<x>102</x>
<y>21</y>
</hint>
</hints>
</connection>

View File

@ -65,11 +65,13 @@ PwDialog::PwDialog(pass_info *p, bool write)
{
pi = p;
setupUi(this);
setWindowTitle(XCA_TITLE);
image->setPixmap(pi->getImage());
description->setText(pi->getDescription());
title->setText(pi->getType());
setWindowTitle(pi->getTitle());
if (!pi->getTitle().isEmpty())
setWindowTitle(pi->getTitle());
else
setWindowTitle(XCA_TITLE);
if (pi->getType() != "PIN")
takeHex->hide();
setRW(write);