Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated the icons in the Main Window #39

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions src/com/_17od/upm/gui/MainWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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);
Expand All @@ -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();
Expand All @@ -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();
Expand All @@ -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) {
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
Binary file added src/com/_17od/upm/util/images/add-account-d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/com/_17od/upm/util/images/add-account.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/com/_17od/upm/util/images/add_account.gif
Binary file not shown.
Binary file removed src/com/_17od/upm/util/images/add_account_d.gif
Binary file not shown.
Binary file added src/com/_17od/upm/util/images/copy-password-d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/com/_17od/upm/util/images/copy-password.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/com/_17od/upm/util/images/copy-username-d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/com/_17od/upm/util/images/copy-username.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/com/_17od/upm/util/images/copy_password.gif
Binary file not shown.
Binary file removed src/com/_17od/upm/util/images/copy_password_d.gif
Binary file not shown.
Binary file removed src/com/_17od/upm/util/images/copy_username.gif
Binary file not shown.
Binary file removed src/com/_17od/upm/util/images/copy_username_d.gif
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/com/_17od/upm/util/images/delete-account.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/com/_17od/upm/util/images/delete_account.gif
Binary file not shown.
Binary file removed src/com/_17od/upm/util/images/delete_account_d.gif
Binary file not shown.
Binary file added src/com/_17od/upm/util/images/edit-account-d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/com/_17od/upm/util/images/edit-account.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/com/_17od/upm/util/images/edit_account.gif
Binary file not shown.
Binary file removed src/com/_17od/upm/util/images/edit_account_d.gif
Binary file not shown.
Binary file added src/com/_17od/upm/util/images/launch-url-d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/com/_17od/upm/util/images/launch-url.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/com/_17od/upm/util/images/launch_URL.gif
Binary file not shown.
Binary file removed src/com/_17od/upm/util/images/launch_URL_d.gif
Binary file not shown.
Binary file added src/com/_17od/upm/util/images/options-d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/com/_17od/upm/util/images/options.gif
Diff not rendered.
Binary file added src/com/_17od/upm/util/images/options.png
Binary file removed src/com/_17od/upm/util/images/options_d.gif
Diff not rendered.
Binary file added src/com/_17od/upm/util/images/search-d.png
Binary file removed src/com/_17od/upm/util/images/search.gif
Diff not rendered.
Binary file added src/com/_17od/upm/util/images/search.png
Binary file removed src/com/_17od/upm/util/images/search_d.gif
Diff not rendered.
Binary file added src/com/_17od/upm/util/images/stop-d.png
Binary file removed src/com/_17od/upm/util/images/stop.gif
Diff not rendered.
Binary file added src/com/_17od/upm/util/images/stop.png
Binary file removed src/com/_17od/upm/util/images/stop_d.gif
Diff not rendered.
Binary file added src/com/_17od/upm/util/images/sync-d.png
Binary file modified src/com/_17od/upm/util/images/sync.png
Binary file removed src/com/_17od/upm/util/images/sync_d.png
Diff not rendered.