mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dive site rewrite: change the default sizes of the dialog

Browse source 
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-06-26 20:54:48 -03:00 • committed by Dirk Hohndel
parent 4426cf706f
commit fd31e7792e
3 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qt-ui/locationinformation.cpp
View file

@ -241,8 +241,8 @@ SimpleDiveSiteEditDialog::~SimpleDiveSiteEditDialog()
void SimpleDiveSiteEditDialog::showEvent(QShowEvent *ev) void SimpleDiveSiteEditDialog::showEvent(QShowEvent *ev)
{ {
const int heigth = 190; const int heigth = 275;
const int width = 280; const int width = 450;
// Position. // Position.
QDialog::showEvent(ev); QDialog::showEvent(ev);
@ -256,8 +256,8 @@ void SimpleDiveSiteEditDialog::showEvent(QShowEvent *ev)
//Da //Da
ui->diveSiteName->setText(displayed_dive_site.name); ui->diveSiteName->setText(displayed_dive_site.name);
ui->diveSiteNotes->setText(displayed_dive_site.notes); ui->diveSiteNotes->setPlainText(displayed_dive_site.notes);
ui->diveSiteDescription->setText(displayed_dive_site.description); ui->diveSiteDescription->setPlainText(displayed_dive_site.description);
const char *gps_text = printGPSCoords(displayed_dive_site.latitude.udeg, displayed_dive_site.longitude.udeg); const char *gps_text = printGPSCoords(displayed_dive_site.latitude.udeg, displayed_dive_site.longitude.udeg);
ui->diveSiteCoordinates->setText(QString(gps_text)); ui->diveSiteCoordinates->setText(QString(gps_text));
@ -294,18 +294,18 @@ void SimpleDiveSiteEditDialog::on_diveSiteCoordinates_editingFinished()
void SimpleDiveSiteEditDialog::on_diveSiteDescription_editingFinished() void SimpleDiveSiteEditDialog::on_diveSiteDescription_editingFinished()
{ {
if (ui->diveSiteDescription->text() == displayed_dive_site.description) if (ui->diveSiteDescription->toPlainText() == displayed_dive_site.description)
return; return;
free(displayed_dive_site.description); free(displayed_dive_site.description);
displayed_dive_site.description = copy_string(qPrintable(ui->diveSiteDescription->text())); displayed_dive_site.description = copy_string(qPrintable(ui->diveSiteDescription->toPlainText()));
changed_dive_site = true; changed_dive_site = true;
} }
void SimpleDiveSiteEditDialog::on_diveSiteNotes_editingFinished() void SimpleDiveSiteEditDialog::on_diveSiteNotes_editingFinished()
{ {
if (ui->diveSiteNotes->text() == displayed_dive_site.notes) if (ui->diveSiteNotes->toPlainText() == displayed_dive_site.notes)
return; return;
free(displayed_dive_site.notes); free(displayed_dive_site.notes);
displayed_dive_site.notes = copy_string(qPrintable(ui->diveSiteNotes->text())); displayed_dive_site.notes = copy_string(qPrintable(ui->diveSiteNotes->toPlainText()));
changed_dive_site = true; changed_dive_site = true;
} }

2
qt-ui/maintab.cpp
View file

@ -240,6 +240,8 @@ void MainTab::setCurrentLocationIndex()
void MainTab::showDiveSiteSimpleEdit() void MainTab::showDiveSiteSimpleEdit()
{ {
if (ui.location->text().isEmpty())
return;
SimpleDiveSiteEditDialog dlg(this); SimpleDiveSiteEditDialog dlg(this);
dlg.exec(); dlg.exec();
if (dlg.changed_dive_site) { if (dlg.changed_dive_site) {

12
qt-ui/simpledivesiteedit.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>280</width> <width>449</width>
<height>190</height> <height>274</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -41,9 +41,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QLineEdit" name="diveSiteDescription"/>
</item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
@ -51,8 +48,11 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QPlainTextEdit" name="diveSiteDescription"/>
</item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QLineEdit" name="diveSiteNotes"/> <widget class="QPlainTextEdit" name="diveSiteNotes"/>
</item> </item>
</layout> </layout>
</widget> </widget>