diff options
| author | Mikko Syrjä <mikko@3d-system.fi> | 2019-03-15 23:11:50 +0200 |
|---|---|---|
| committer | Mikko Syrjä <mikko@3d-system.fi> | 2019-03-15 23:11:50 +0200 |
| commit | 1e0dfa10ac89907750309c5a618997c074c03a9b (patch) | |
| tree | 044d5faaf73b48b61dc3de83c086931c4e8e5644 | |
| parent | 7e35949a37b7829f5ba46c5c504a78b998335812 (diff) | |
| download | symedit-1e0dfa10ac89907750309c5a618997c074c03a9b.tar.gz symedit-1e0dfa10ac89907750309c5a618997c074c03a9b.zip | |
Added Windows icon.
| -rw-r--r-- | help/eng/index.rst | 1 | ||||
| -rw-r--r-- | help/fin/index.rst | 1 | ||||
| -rw-r--r-- | image/icon.ico | bin | 0 -> 23224 bytes | |||
| -rw-r--r-- | image/icon16.png | bin | 0 -> 433 bytes | |||
| -rw-r--r-- | image/icon24.png | bin | 0 -> 627 bytes | |||
| -rw-r--r-- | image/icon256.png | bin | 0 -> 8464 bytes | |||
| -rw-r--r-- | image/icon32.png | bin | 0 -> 876 bytes | |||
| -rw-r--r-- | image/icon48.png | bin | 0 -> 1417 bytes | |||
| -rw-r--r-- | symbol.cpp | 4 | ||||
| -rw-r--r-- | symedit.cpp | 2 | ||||
| -rw-r--r-- | symedit.pro | 10 |
11 files changed, 14 insertions, 4 deletions
diff --git a/help/eng/index.rst b/help/eng/index.rst index 2efbf54..5f5982b 100644 --- a/help/eng/index.rst +++ b/help/eng/index.rst @@ -20,4 +20,3 @@ SymEdit is symbol editor for symbols used by `3D-Win`_ survey application. Source code available in `Github`_ service. Some toolbar button images taken from `Gentleface`_ icon set. - diff --git a/help/fin/index.rst b/help/fin/index.rst index 48cebe1..56017d2 100644 --- a/help/fin/index.rst +++ b/help/fin/index.rst @@ -20,4 +20,3 @@ SymEdit on symbolieditori `3D-Win`_ -maastomittausohjelman käyttämille symbole Lähdekoodi saatavilla `Github`_ -palvelussa. Osa työkalupalkin kuvakkeista otettu `Gentleface`_ ikonisetistä. - diff --git a/image/icon.ico b/image/icon.ico Binary files differnew file mode 100644 index 0000000..b91c2e8 --- /dev/null +++ b/image/icon.ico diff --git a/image/icon16.png b/image/icon16.png Binary files differnew file mode 100644 index 0000000..4d2c468 --- /dev/null +++ b/image/icon16.png diff --git a/image/icon24.png b/image/icon24.png Binary files differnew file mode 100644 index 0000000..258aa63 --- /dev/null +++ b/image/icon24.png diff --git a/image/icon256.png b/image/icon256.png Binary files differnew file mode 100644 index 0000000..dcd90fe --- /dev/null +++ b/image/icon256.png diff --git a/image/icon32.png b/image/icon32.png Binary files differnew file mode 100644 index 0000000..6ceeadd --- /dev/null +++ b/image/icon32.png diff --git a/image/icon48.png b/image/icon48.png Binary files differnew file mode 100644 index 0000000..4ed589a --- /dev/null +++ b/image/icon48.png @@ -219,13 +219,15 @@ SymEditSymbol::Item& SymEditSymbol::AddItem(Operation::Type operation, QPoint po /*! \param index Item index. \return True for success. + + Activates previous or first item. */ bool SymEditSymbol::RemoveItem(int index) { if ( static_cast<size_t>(index) < Items.size() ) { Items.erase(Items.begin() + index); - ActiveIndex = index - 1; + ActiveIndex = (index == 0 && !Items.empty() ? 0 : index - 1); return true; } return false; diff --git a/symedit.cpp b/symedit.cpp index 99771f8..3d28e28 100644 --- a/symedit.cpp +++ b/symedit.cpp @@ -233,6 +233,8 @@ bool SymEditManager::addTextItem(int operation, QPoint point, QString value, int //! Remove active item. /*! \return True for success. + + Activates previous or first item. */ bool SymEditManager::removeItem() { diff --git a/symedit.pro b/symedit.pro index cc98243..41461ae 100644 --- a/symedit.pro +++ b/symedit.pro @@ -20,6 +20,8 @@ RESOURCES += \ qml.qrc \ locale.qrc +RC_ICONS = image/icon.ico + # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = @@ -69,4 +71,10 @@ DISTFILES += \ help/eng/tools.rst \ help/eng/usage.rst \ help/eng/Makefile \ - help/eng/conf.py + help/eng/conf.py \ + image/icon16.png \ + image/icon24.png \ + image/icon32.png \ + image/icon48.png \ + image/icon256.png \ + image/icon.ico |
