This is an automated email from the git hooks/post-receive script. New commit to branch feature/4309_synchro_referential in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e164366ca7fd2052e6f57284cbdd5efc02f19385 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 10 14:21:28 2016 +0200 -mAdd new icons --- .../src/main/filters/observe-ui.properties | 13 +++++++++++++ .../src/main/resources/icons/action-copyToBoth.png | Bin 0 -> 685 bytes .../main/resources/icons/action-desactivateFromLeft.png | Bin 0 -> 796 bytes .../icons/action-desactivateFromLeftWithReplace.png | Bin 0 -> 796 bytes .../main/resources/icons/action-desactivateFromRight.png | Bin 0 -> 796 bytes .../icons/action-desactivateFromRightWithReplace.png | Bin 0 -> 796 bytes .../src/main/resources/icons/action-revertFromLeft.png | Bin 0 -> 770 bytes .../src/main/resources/icons/action-revertFromRight.png | Bin 0 -> 770 bytes .../src/main/resources/icons/action-skipFromLeft.png | Bin 0 -> 655 bytes .../src/main/resources/icons/action-skipFromRight.png | Bin 0 -> 655 bytes .../src/main/resources/icons/action-synchroAdd.png | Bin 0 -> 658 bytes .../src/main/resources/icons/action-synchroDelete.png | Bin 0 -> 659 bytes .../src/main/resources/icons/action-synchroRevert.png | Bin 0 -> 770 bytes .../src/main/resources/icons/action-synchroUpdate.png | Bin 0 -> 698 bytes 14 files changed, 13 insertions(+) diff --git a/observe-application-swing/src/main/filters/observe-ui.properties b/observe-application-swing/src/main/filters/observe-ui.properties index ce7bbde..8ff0726 100644 --- a/observe-application-swing/src/main/filters/observe-ui.properties +++ b/observe-application-swing/src/main/filters/observe-ui.properties @@ -101,6 +101,7 @@ icon.action.connect_no=action-connect_no.png icon.action.connect_ok=action-connect_ok.png icon.action.copyToLeft=action-copyToLeft.png icon.action.copyToRight=action-copyToRight.png +icon.action.copyToBoth=action-copyToBoth.png icon.action.close=action-close.png icon.action.db-change=action-db-change.png icon.action.db-local=action-db-local.png @@ -110,6 +111,16 @@ icon.action.db-remote=action-db-remote.png icon.action.db-reload=action-db-reload.png icon.action.db-start-server=action-db-start-server.png icon.action.db-stop-server=action-db-stop-server.png +icon.action.desactivateFromLeft=action-desactivateFromLeft.png +icon.action.desactivateFromRight=action-desactivateFromRight.png +icon.action.desactivateFromLeftWithReplace=action-desactivateFromLeftWithReplace.png +icon.action.desactivateFromRightWithReplace=action-desactivateFromRightWithReplace.png +icon.action.skipFromLeft=action-skipFromLeft.png +icon.action.skipFromRight=action-skipFromRight.png +icon.action.synchroAdd=action-synchroAdd.png +icon.action.synchroUpdate=action-synchroUpdate.png +icon.action.synchroRevert=action-synchroRevert.png +icon.action.synchroDelete=action-synchroDelete.png icon.action.delete=action-delete.png icon.action.deleteFromLeft=action-deleteFromLeft.png icon.action.deleteFromRight=action-deleteFromRight.png @@ -138,6 +149,8 @@ icon.action.remote-export=action-remote-export.png icon.action.remote-import=action-remote-import.png icon.action.remove=action-remove.png icon.action.revert=action-revert.png +icon.action.revertFromLeft=action-revertFromLeft.png +icon.action.revertFromRight=action-revertFromRight.png icon.action.save=action-save.png icon.action.select-ssl-cert=action-select-ssl-cert.png icon.action.show-help=action-show-help.png diff --git a/observe-application-swing/src/main/resources/icons/action-copyToBoth.png b/observe-application-swing/src/main/resources/icons/action-copyToBoth.png new file mode 100644 index 0000000..0de2656 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-copyToBoth.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-desactivateFromLeft.png b/observe-application-swing/src/main/resources/icons/action-desactivateFromLeft.png new file mode 100644 index 0000000..b335cb1 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-desactivateFromLeft.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-desactivateFromLeftWithReplace.png b/observe-application-swing/src/main/resources/icons/action-desactivateFromLeftWithReplace.png new file mode 100644 index 0000000..b335cb1 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-desactivateFromLeftWithReplace.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-desactivateFromRight.png b/observe-application-swing/src/main/resources/icons/action-desactivateFromRight.png new file mode 100644 index 0000000..b335cb1 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-desactivateFromRight.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-desactivateFromRightWithReplace.png b/observe-application-swing/src/main/resources/icons/action-desactivateFromRightWithReplace.png new file mode 100644 index 0000000..b335cb1 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-desactivateFromRightWithReplace.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-revertFromLeft.png b/observe-application-swing/src/main/resources/icons/action-revertFromLeft.png new file mode 100644 index 0000000..ff803be Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-revertFromLeft.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-revertFromRight.png b/observe-application-swing/src/main/resources/icons/action-revertFromRight.png new file mode 100644 index 0000000..ff803be Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-revertFromRight.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-skipFromLeft.png b/observe-application-swing/src/main/resources/icons/action-skipFromLeft.png new file mode 100644 index 0000000..1514d51 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-skipFromLeft.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-skipFromRight.png b/observe-application-swing/src/main/resources/icons/action-skipFromRight.png new file mode 100644 index 0000000..1514d51 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-skipFromRight.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-synchroAdd.png b/observe-application-swing/src/main/resources/icons/action-synchroAdd.png new file mode 100644 index 0000000..802bd6c Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-synchroAdd.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-synchroDelete.png b/observe-application-swing/src/main/resources/icons/action-synchroDelete.png new file mode 100644 index 0000000..cce652e Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-synchroDelete.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-synchroRevert.png b/observe-application-swing/src/main/resources/icons/action-synchroRevert.png new file mode 100644 index 0000000..ff803be Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-synchroRevert.png differ diff --git a/observe-application-swing/src/main/resources/icons/action-synchroUpdate.png b/observe-application-swing/src/main/resources/icons/action-synchroUpdate.png new file mode 100644 index 0000000..61a8556 Binary files /dev/null and b/observe-application-swing/src/main/resources/icons/action-synchroUpdate.png differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.