------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee. http://bugs.kde.org/show_bug.cgi?id=111560 ------- Additional Comments From caulier.gilles free fr 2006-09-28 08:48 ------- SVN commit 589488 by cgilles: kipi-plugins from trunk : GPSSync tool : "Remove" button to delete GPS data from picture is now on main dialog. CCMAIL: gerhard kulzer net CCBUGS: 133359, 111560 M +6 -12 gpseditdialog.cpp M +0 -1 gpseditdialog.h M +41 -31 gpssyncdialog.cpp M +1 -0 gpssyncdialog.h --- trunk/extragear/libs/kipi-plugins/gpssync/gpseditdialog.cpp #589487:589488 @ -68,25 +68,24 @ worldMap = 0; } - QComboBox *gpsCombo; + QComboBox *gpsCombo; - KLineEdit *altitudeInput; - KLineEdit *latitudeInput; - KLineEdit *longitudeInput; + KLineEdit *altitudeInput; + KLineEdit *latitudeInput; + KLineEdit *longitudeInput; - KHTMLPart *worldMap; + KHTMLPart *worldMap; }; GPSEditDialog::GPSEditDialog(QWidget* parent, GPSDataContainer gpsData, const QString& fileName) : KDialogBase(Plain, i18n("%1 - Edit GPS coordinates").arg(fileName), - Help|User1|Ok|Cancel, Ok, + Help|Ok|Cancel, Ok, parent, 0, true, true) { d = new GPSEditDialogDialogPrivate; setHelp("gpssync", "kipi-plugins"); - setButtonText(User1, i18n("Delete Coordinates")); QGridLayout* grid = new QGridLayout(plainPage(), 4, 3, 0, spacingHint()); @ -224,11 +223,6 @ accept(); } -void GPSEditDialog::slotUser1() -{ - done(-1); -} - void GPSEditDialog::slotGPSLocator(int i) { switch(i) --- trunk/extragear/libs/kipi-plugins/gpssync/gpseditdialog.h #589487:589488 @ -50,7 +50,6 @ void slotOk(); void slotClose(); - void slotUser1(); void slotGPSLocator(int); protected: --- trunk/extragear/libs/kipi-plugins/gpssync/gpssyncdialog.cpp #589487:589488 @ -100,16 +100,23 @ GPSSyncDialog::GPSSyncDialog( KIPI::Interface* interface, QWidget* parent) : KDialogBase(Plain, i18n("GPS Sync"), - Help|User1|User2|Apply|Close, Close, + Help|User1|User2|User3|Apply|Close, Close, parent, 0, true, true ) { d = new GPSSyncDialogPriv; d->interface = interface; setButtonText(User1, i18n("Correlate")); - setButtonText(User2, i18n("Edit Coordinates...")); + setButtonText(User2, i18n("Edit...")); + setButtonText(User3, i18n("Remove")); + + setButtonTip(User1, i18n("Correlate GPX file data with all pictures from the list.")); + setButtonTip(User2, i18n("Edit manually GPS coordinates of selected pictures form the list.")); + setButtonTip(User3, i18n("Remove GPS coordinates of selected pictures form the list.")); + enableButton(User1, false); enableButton(User2, true); + enableButton(User3, true); QGridLayout *mainLayout = new QGridLayout(plainPage(), 3, 1, 0, marginHint()); @ -364,7 +371,7 @ config.sync(); } -// Start to correlate the GPS positions and Pictures +// Correlate the GPS positions from Pictures using a GPX file data. void GPSSyncDialog::slotUser1() { int itemsUpdated = 0; @ -406,48 +413,51 @ { if (!d->listView->currentItem()) { - KMessageBox::information(this, i18n("Please, select a picture from " - "the list to edit GPS coordinate manually."), i18n("GPS Sync")); + KMessageBox::information(this, i18n("Please, select pictures from " + "the list to edit GPS coordinates manually."), i18n("GPS Sync")); return; } GPSListViewItem* item = (GPSListViewItem*)d->listView->currentItem(); GPSEditDialog dlg(this, item->getGPSInfo(), item->getUrl().fileName()); - switch (dlg.exec()) + + if (dlg.exec() == KDialogBase::Accepted) { - case KDialogBase::Accepted: + QListViewItemIterator it(d->listView); + + while (it.current()) { - QListViewItemIterator it(d->listView); - - while (it.current()) + if (it.current()->isSelected()) { - if (it.current()->isSelected()) - { - GPSListViewItem *selItem = (GPSListViewItem*)it.current(); - selItem->setGPSInfo(dlg.getGPSInfo(), true, true); - } - ++it; + GPSListViewItem *selItem = (GPSListViewItem*)it.current(); + selItem->setGPSInfo(dlg.getGPSInfo(), true, true); } - - break; + ++it; } - case(-1): // Erase all GPS tags - { - QListViewItemIterator it(d->listView); + } +} - while (it.current()) - { - if (it.current()->isSelected()) - { - GPSListViewItem *selItem = (GPSListViewItem*)it.current(); - selItem->eraseGPSInfo(); - } - ++it; - } +// Remove GPS coordinates from pictures. +void GPSSyncDialog::slotUser3() +{ + if (!d->listView->currentItem()) + { + KMessageBox::information(this, i18n("Please, select pictures from " + "the list to remove GPS coordinates."), i18n("GPS Sync")); + return; + } - break; + QListViewItemIterator it(d->listView); + + while (it.current()) + { + if (it.current()->isSelected()) + { + GPSListViewItem *selItem = (GPSListViewItem*)it.current(); + selItem->eraseGPSInfo(); } + ++it; } } --- trunk/extragear/libs/kipi-plugins/gpssync/gpssyncdialog.h #589487:589488 @ -60,6 +60,7 @ void slotClose(); void slotUser1(); void slotUser2(); + void slotUser3(); private slots: _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Free forum by Nabble | Edit this page |