diff --git a/src/com/_17od/upm/gui/MainWindow.java b/src/com/_17od/upm/gui/MainWindow.java index 82ed5be..b41ed7a 100644 --- a/src/com/_17od/upm/gui/MainWindow.java +++ b/src/com/_17od/upm/gui/MainWindow.java @@ -255,8 +255,8 @@ private void addComponentsToPane() { getContentPane().add(new JSeparator(), c); //The search field row - searchIcon = new JLabel(Util.loadImage("search.gif")); - searchIcon.setDisabledIcon(Util.loadImage("search_d.gif")); + searchIcon = new JLabel(Util.loadImage("search.png")); + searchIcon.setDisabledIcon(Util.loadImage("search-d.png")); searchIcon.setEnabled(false); c.gridx = 0; c.gridy = 2; @@ -307,8 +307,8 @@ public void keyPressed(KeyEvent e) { c.fill = GridBagConstraints.NONE; getContentPane().add(searchField, c); - resetSearchButton = new JButton(Util.loadImage("stop.gif")); - resetSearchButton.setDisabledIcon(Util.loadImage("stop_d.gif")); + resetSearchButton = new JButton(Util.loadImage("stop.png")); + resetSearchButton.setDisabledIcon(Util.loadImage("stop-d.png")); resetSearchButton.setEnabled(false); resetSearchButton.setToolTipText(Translator.translate(RESET_SEARCH_TXT)); resetSearchButton.setActionCommand(RESET_SEARCH_TXT); @@ -429,8 +429,8 @@ private JToolBar createToolBar() { // The "Add Account" button addAccountButton = new JButton(); addAccountButton.setToolTipText(Translator.translate(ADD_ACCOUNT_TXT)); - addAccountButton.setIcon(Util.loadImage("add_account.gif")); - addAccountButton.setDisabledIcon(Util.loadImage("add_account_d.gif"));; + addAccountButton.setIcon(Util.loadImage("add-account.png")); + addAccountButton.setDisabledIcon(Util.loadImage("add-account-d.png")); addAccountButton.addActionListener(this); addAccountButton.setEnabled(false); addAccountButton.setActionCommand(ADD_ACCOUNT_TXT); @@ -439,8 +439,8 @@ private JToolBar createToolBar() { // The "Edit Account" button editAccountButton = new JButton(); editAccountButton.setToolTipText(Translator.translate(EDIT_ACCOUNT_TXT)); - editAccountButton.setIcon(Util.loadImage("edit_account.gif")); - editAccountButton.setDisabledIcon(Util.loadImage("edit_account_d.gif"));; + editAccountButton.setIcon(Util.loadImage("edit-account.png")); + editAccountButton.setDisabledIcon(Util.loadImage("edit-account-d.png")); editAccountButton.addActionListener(this); editAccountButton.setEnabled(false); editAccountButton.setActionCommand(EDIT_ACCOUNT_TXT); @@ -449,8 +449,8 @@ private JToolBar createToolBar() { // The "Delete Account" button deleteAccountButton = new JButton(); deleteAccountButton.setToolTipText(Translator.translate(DELETE_ACCOUNT_TXT)); - deleteAccountButton.setIcon(Util.loadImage("delete_account.gif")); - deleteAccountButton.setDisabledIcon(Util.loadImage("delete_account_d.gif"));; + deleteAccountButton.setIcon(Util.loadImage("delete-account.png")); + deleteAccountButton.setDisabledIcon(Util.loadImage("delete-account-d.png")); deleteAccountButton.addActionListener(this); deleteAccountButton.setEnabled(false); deleteAccountButton.setActionCommand(DELETE_ACCOUNT_TXT); @@ -461,8 +461,8 @@ private JToolBar createToolBar() { // The "Copy Username" button copyUsernameButton = new JButton(); copyUsernameButton.setToolTipText(Translator.translate(COPY_USERNAME_TXT)); - copyUsernameButton.setIcon(Util.loadImage("copy_username.gif")); - copyUsernameButton.setDisabledIcon(Util.loadImage("copy_username_d.gif"));; + copyUsernameButton.setIcon(Util.loadImage("copy-username.png")); + copyUsernameButton.setDisabledIcon(Util.loadImage("copy-username-d.png")); copyUsernameButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { copyUsernameToClipboard(); @@ -474,8 +474,8 @@ public void actionPerformed(ActionEvent e) { // The "Copy Password" button copyPasswordButton = new JButton(); copyPasswordButton.setToolTipText(Translator.translate(COPY_PASSWORD_TXT)); - copyPasswordButton.setIcon(Util.loadImage("copy_password.gif")); - copyPasswordButton.setDisabledIcon(Util.loadImage("copy_password_d.gif"));; + copyPasswordButton.setIcon(Util.loadImage("copy-password.png")); + copyPasswordButton.setDisabledIcon(Util.loadImage("copy-password-d.png")); copyPasswordButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { copyPasswordToClipboard(); @@ -489,8 +489,8 @@ public void actionPerformed(ActionEvent e) { // The "Launch URL" button launchURLButton = new JButton(); launchURLButton.setToolTipText(Translator.translate(LAUNCH_URL_TXT)); - launchURLButton.setIcon(Util.loadImage("launch_URL.gif")); - launchURLButton.setDisabledIcon(Util.loadImage("launch_URL_d.gif"));; + launchURLButton.setIcon(Util.loadImage("launch-url.png")); + launchURLButton.setDisabledIcon(Util.loadImage("launch-url-d.png")); launchURLButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -521,8 +521,8 @@ public void actionPerformed(ActionEvent e) { // The "Option" button optionsButton = new JButton(); optionsButton.setToolTipText(Translator.translate(OPTIONS_TXT)); - optionsButton.setIcon(Util.loadImage("options.gif")); - optionsButton.setDisabledIcon(Util.loadImage("options_d.gif"));; + optionsButton.setIcon(Util.loadImage("options.png")); + optionsButton.setDisabledIcon(Util.loadImage("options-d.png")); optionsButton.addActionListener(this); optionsButton.setEnabled(true); optionsButton.setActionCommand(OPTIONS_TXT); @@ -534,7 +534,7 @@ public void actionPerformed(ActionEvent e) { syncDatabaseButton = new JButton(); syncDatabaseButton.setToolTipText(Translator.translate(SYNC_DATABASE_TXT)); syncDatabaseButton.setIcon(Util.loadImage("sync.png")); - syncDatabaseButton.setDisabledIcon(Util.loadImage("sync_d.png"));; + syncDatabaseButton.setDisabledIcon(Util.loadImage("sync-d.png")); syncDatabaseButton.addActionListener(this); syncDatabaseButton.setEnabled(false); syncDatabaseButton.setActionCommand(SYNC_DATABASE_TXT); diff --git a/src/com/_17od/upm/util/images/add-account-d.png b/src/com/_17od/upm/util/images/add-account-d.png new file mode 100644 index 0000000..982f015 Binary files /dev/null and b/src/com/_17od/upm/util/images/add-account-d.png differ diff --git a/src/com/_17od/upm/util/images/add-account.png b/src/com/_17od/upm/util/images/add-account.png new file mode 100644 index 0000000..72fff84 Binary files /dev/null and b/src/com/_17od/upm/util/images/add-account.png differ diff --git a/src/com/_17od/upm/util/images/add_account.gif b/src/com/_17od/upm/util/images/add_account.gif deleted file mode 100644 index a6b5822..0000000 Binary files a/src/com/_17od/upm/util/images/add_account.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/add_account_d.gif b/src/com/_17od/upm/util/images/add_account_d.gif deleted file mode 100644 index 323070a..0000000 Binary files a/src/com/_17od/upm/util/images/add_account_d.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/copy-password-d.png b/src/com/_17od/upm/util/images/copy-password-d.png new file mode 100644 index 0000000..6fd199a Binary files /dev/null and b/src/com/_17od/upm/util/images/copy-password-d.png differ diff --git a/src/com/_17od/upm/util/images/copy-password.png b/src/com/_17od/upm/util/images/copy-password.png new file mode 100644 index 0000000..05d7cd0 Binary files /dev/null and b/src/com/_17od/upm/util/images/copy-password.png differ diff --git a/src/com/_17od/upm/util/images/copy-username-d.png b/src/com/_17od/upm/util/images/copy-username-d.png new file mode 100644 index 0000000..6e3ecd2 Binary files /dev/null and b/src/com/_17od/upm/util/images/copy-username-d.png differ diff --git a/src/com/_17od/upm/util/images/copy-username.png b/src/com/_17od/upm/util/images/copy-username.png new file mode 100644 index 0000000..cd03a4e Binary files /dev/null and b/src/com/_17od/upm/util/images/copy-username.png differ diff --git a/src/com/_17od/upm/util/images/copy_password.gif b/src/com/_17od/upm/util/images/copy_password.gif deleted file mode 100644 index 125c033..0000000 Binary files a/src/com/_17od/upm/util/images/copy_password.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/copy_password_d.gif b/src/com/_17od/upm/util/images/copy_password_d.gif deleted file mode 100644 index 2424b60..0000000 Binary files a/src/com/_17od/upm/util/images/copy_password_d.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/copy_username.gif b/src/com/_17od/upm/util/images/copy_username.gif deleted file mode 100644 index b0886e1..0000000 Binary files a/src/com/_17od/upm/util/images/copy_username.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/copy_username_d.gif b/src/com/_17od/upm/util/images/copy_username_d.gif deleted file mode 100644 index 82da32e..0000000 Binary files a/src/com/_17od/upm/util/images/copy_username_d.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/delete-account-d.png b/src/com/_17od/upm/util/images/delete-account-d.png new file mode 100644 index 0000000..e91276c Binary files /dev/null and b/src/com/_17od/upm/util/images/delete-account-d.png differ diff --git a/src/com/_17od/upm/util/images/delete-account.png b/src/com/_17od/upm/util/images/delete-account.png new file mode 100644 index 0000000..8ac2828 Binary files /dev/null and b/src/com/_17od/upm/util/images/delete-account.png differ diff --git a/src/com/_17od/upm/util/images/delete_account.gif b/src/com/_17od/upm/util/images/delete_account.gif deleted file mode 100644 index 01198cb..0000000 Binary files a/src/com/_17od/upm/util/images/delete_account.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/delete_account_d.gif b/src/com/_17od/upm/util/images/delete_account_d.gif deleted file mode 100644 index 02f4d4a..0000000 Binary files a/src/com/_17od/upm/util/images/delete_account_d.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/edit-account-d.png b/src/com/_17od/upm/util/images/edit-account-d.png new file mode 100644 index 0000000..3da3046 Binary files /dev/null and b/src/com/_17od/upm/util/images/edit-account-d.png differ diff --git a/src/com/_17od/upm/util/images/edit-account.png b/src/com/_17od/upm/util/images/edit-account.png new file mode 100644 index 0000000..2725009 Binary files /dev/null and b/src/com/_17od/upm/util/images/edit-account.png differ diff --git a/src/com/_17od/upm/util/images/edit_account.gif b/src/com/_17od/upm/util/images/edit_account.gif deleted file mode 100644 index 7640a9e..0000000 Binary files a/src/com/_17od/upm/util/images/edit_account.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/edit_account_d.gif b/src/com/_17od/upm/util/images/edit_account_d.gif deleted file mode 100644 index 9711301..0000000 Binary files a/src/com/_17od/upm/util/images/edit_account_d.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/launch-url-d.png b/src/com/_17od/upm/util/images/launch-url-d.png new file mode 100644 index 0000000..2fe9137 Binary files /dev/null and b/src/com/_17od/upm/util/images/launch-url-d.png differ diff --git a/src/com/_17od/upm/util/images/launch-url.png b/src/com/_17od/upm/util/images/launch-url.png new file mode 100644 index 0000000..a8ba1b0 Binary files /dev/null and b/src/com/_17od/upm/util/images/launch-url.png differ diff --git a/src/com/_17od/upm/util/images/launch_URL.gif b/src/com/_17od/upm/util/images/launch_URL.gif deleted file mode 100644 index de19d7f..0000000 Binary files a/src/com/_17od/upm/util/images/launch_URL.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/launch_URL_d.gif b/src/com/_17od/upm/util/images/launch_URL_d.gif deleted file mode 100644 index 91463da..0000000 Binary files a/src/com/_17od/upm/util/images/launch_URL_d.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/options-d.png b/src/com/_17od/upm/util/images/options-d.png new file mode 100644 index 0000000..3b0c725 Binary files /dev/null and b/src/com/_17od/upm/util/images/options-d.png differ diff --git a/src/com/_17od/upm/util/images/options.gif b/src/com/_17od/upm/util/images/options.gif deleted file mode 100644 index e144f7e..0000000 Binary files a/src/com/_17od/upm/util/images/options.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/options.png b/src/com/_17od/upm/util/images/options.png new file mode 100644 index 0000000..ab69cbe Binary files /dev/null and b/src/com/_17od/upm/util/images/options.png differ diff --git a/src/com/_17od/upm/util/images/options_d.gif b/src/com/_17od/upm/util/images/options_d.gif deleted file mode 100644 index 33ca731..0000000 Binary files a/src/com/_17od/upm/util/images/options_d.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/search-d.png b/src/com/_17od/upm/util/images/search-d.png new file mode 100644 index 0000000..5256bed Binary files /dev/null and b/src/com/_17od/upm/util/images/search-d.png differ diff --git a/src/com/_17od/upm/util/images/search.gif b/src/com/_17od/upm/util/images/search.gif deleted file mode 100644 index 85d37d2..0000000 Binary files a/src/com/_17od/upm/util/images/search.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/search.png b/src/com/_17od/upm/util/images/search.png new file mode 100644 index 0000000..17452a6 Binary files /dev/null and b/src/com/_17od/upm/util/images/search.png differ diff --git a/src/com/_17od/upm/util/images/search_d.gif b/src/com/_17od/upm/util/images/search_d.gif deleted file mode 100644 index e3b65a7..0000000 Binary files a/src/com/_17od/upm/util/images/search_d.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/stop-d.png b/src/com/_17od/upm/util/images/stop-d.png new file mode 100644 index 0000000..cb9ff37 Binary files /dev/null and b/src/com/_17od/upm/util/images/stop-d.png differ diff --git a/src/com/_17od/upm/util/images/stop.gif b/src/com/_17od/upm/util/images/stop.gif deleted file mode 100644 index 8437425..0000000 Binary files a/src/com/_17od/upm/util/images/stop.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/stop.png b/src/com/_17od/upm/util/images/stop.png new file mode 100644 index 0000000..efc721e Binary files /dev/null and b/src/com/_17od/upm/util/images/stop.png differ diff --git a/src/com/_17od/upm/util/images/stop_d.gif b/src/com/_17od/upm/util/images/stop_d.gif deleted file mode 100644 index d43e98f..0000000 Binary files a/src/com/_17od/upm/util/images/stop_d.gif and /dev/null differ diff --git a/src/com/_17od/upm/util/images/sync-d.png b/src/com/_17od/upm/util/images/sync-d.png new file mode 100644 index 0000000..3bb249b Binary files /dev/null and b/src/com/_17od/upm/util/images/sync-d.png differ diff --git a/src/com/_17od/upm/util/images/sync.png b/src/com/_17od/upm/util/images/sync.png index 77b3caa..c4645aa 100644 Binary files a/src/com/_17od/upm/util/images/sync.png and b/src/com/_17od/upm/util/images/sync.png differ diff --git a/src/com/_17od/upm/util/images/sync_d.png b/src/com/_17od/upm/util/images/sync_d.png deleted file mode 100644 index 6c0eeff..0000000 Binary files a/src/com/_17od/upm/util/images/sync_d.png and /dev/null differ