diff --git a/Order Processor/.classpath b/Order Processor/.classpath index f62240b..57b95b0 100644 --- a/Order Processor/.classpath +++ b/Order Processor/.classpath @@ -2,7 +2,7 @@ - + diff --git a/Order Processor/images/accept.png b/Order Processor/images/accept.png new file mode 100644 index 0000000..3793825 Binary files /dev/null and b/Order Processor/images/accept.png differ diff --git a/Order Processor/images/calendar_date.png b/Order Processor/images/calendar_date.png new file mode 100644 index 0000000..3ebcaac Binary files /dev/null and b/Order Processor/images/calendar_date.png differ diff --git a/Order Processor/images/database.png b/Order Processor/images/database.png new file mode 100644 index 0000000..022ce14 Binary files /dev/null and b/Order Processor/images/database.png differ diff --git a/Order Processor/images/database_accept.png b/Order Processor/images/database_accept.png new file mode 100644 index 0000000..ac3057a Binary files /dev/null and b/Order Processor/images/database_accept.png differ diff --git a/Order Processor/images/database_add.png b/Order Processor/images/database_add.png new file mode 100644 index 0000000..5b3cabf Binary files /dev/null and b/Order Processor/images/database_add.png differ diff --git a/Order Processor/images/database_down.png b/Order Processor/images/database_down.png new file mode 100644 index 0000000..eeb0c3f Binary files /dev/null and b/Order Processor/images/database_down.png differ diff --git a/Order Processor/images/database_lock.png b/Order Processor/images/database_lock.png new file mode 100644 index 0000000..8eebd97 Binary files /dev/null and b/Order Processor/images/database_lock.png differ diff --git a/Order Processor/images/database_next.png b/Order Processor/images/database_next.png new file mode 100644 index 0000000..e05a830 Binary files /dev/null and b/Order Processor/images/database_next.png differ diff --git a/Order Processor/images/database_previous.png b/Order Processor/images/database_previous.png new file mode 100644 index 0000000..1549601 Binary files /dev/null and b/Order Processor/images/database_previous.png differ diff --git a/Order Processor/images/database_process.png b/Order Processor/images/database_process.png new file mode 100644 index 0000000..f001ef3 Binary files /dev/null and b/Order Processor/images/database_process.png differ diff --git a/Order Processor/images/database_remove.png b/Order Processor/images/database_remove.png new file mode 100644 index 0000000..8bcb9c8 Binary files /dev/null and b/Order Processor/images/database_remove.png differ diff --git a/Order Processor/images/database_search.png b/Order Processor/images/database_search.png new file mode 100644 index 0000000..bad158d Binary files /dev/null and b/Order Processor/images/database_search.png differ diff --git a/Order Processor/images/database_up.png b/Order Processor/images/database_up.png new file mode 100644 index 0000000..c6ad284 Binary files /dev/null and b/Order Processor/images/database_up.png differ diff --git a/Order Processor/images/info.png b/Order Processor/images/info.png new file mode 100644 index 0000000..a767241 Binary files /dev/null and b/Order Processor/images/info.png differ diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/Main.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/Main.java index 59a4d34..4cf7eb3 100644 --- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/Main.java +++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/Main.java @@ -15,7 +15,7 @@ import com.TwentyCodes.java.OrderProcessor.UI.MainWindow; public class Main { - public static final boolean DEBUG = true; + public static final boolean DEBUG = false; /** * called when the application first starts diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/DatePicker.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/DatePicker.java index 53709ab..08319a5 100644 --- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/DatePicker.java +++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/DatePicker.java @@ -11,6 +11,7 @@ import java.awt.HeadlessException; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -44,6 +45,9 @@ public class DatePicker extends JFrame implements ActionListener { * @author ricky barrette */ public DatePicker(int resultCode, DatePickerListener listener) { + this.setTitle("Date Picker"); + setIconImage(new ImageIcon("images/calendar_date.png").getImage()); + mResultCode = resultCode; mListener = listener; @@ -68,7 +72,7 @@ public class DatePicker extends JFrame implements ActionListener { this.getContentPane().add(mCalendar, BorderLayout.CENTER); //ok button - mOkButton = new JButton("Ok"); + mOkButton = new JButton("Ok", new ImageIcon("images/accept.png")); mOkButton.addActionListener(this); this.getContentPane().add(mOkButton, BorderLayout.SOUTH); diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/MainWindow.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/MainWindow.java index 05a2c68..054a795 100644 --- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/MainWindow.java +++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/MainWindow.java @@ -16,6 +16,7 @@ import java.io.IOException; import java.io.LineNumberReader; import java.sql.SQLException; +import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JFrame; @@ -52,23 +53,32 @@ public class MainWindow extends JFrame implements ActionListener, ProgressListen this.setDefaultCloseOperation(EXIT_ON_CLOSE); setTitle("Twenty Codes, LLC Order Database"); + setIconImage(new ImageIcon("images/database.png").getImage()); + JPanel panel = new JPanel(); getContentPane().add(panel); - mShowAllButton = new JButton("Show All Orders"); - mShowAllButton.addActionListener(this); - mSearchButton = new JButton("Search"); + //Search buttom + mSearchButton = new JButton("Search", new ImageIcon("images/database_search.png")); mSearchButton.addActionListener(this); panel.add(mSearchButton); + + //show all button + mShowAllButton = new JButton("Show All Orders", new ImageIcon("images/database.png")); + mShowAllButton.addActionListener(this); panel.add(mShowAllButton); - mLoadFileButton = new JButton("Load File"); + + //load button + mLoadFileButton = new JButton("Load File", new ImageIcon("images/database_add.png")); mLoadFileButton.addActionListener(this); panel.add(mLoadFileButton); + //progress bar mProgressBar = new JProgressBar(); mProgressBar.setStringPainted(true); getContentPane().add(mProgressBar, BorderLayout.SOUTH); + setVisible(true); pack(); diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchDialog.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchDialog.java index bb4bf87..8230192 100644 --- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchDialog.java +++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/SearchDialog.java @@ -15,6 +15,7 @@ import java.io.IOException; import java.sql.SQLException; import java.util.ArrayList; +import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -54,6 +55,7 @@ public class SearchDialog extends JFrame implements ActionListener, ProgressList super(); setTitle("Search"); + setIconImage(new ImageIcon("images/database_search.png").getImage()); //create a JPanel to hold the text area and button JPanel panel = new JPanel(); @@ -83,7 +85,7 @@ public class SearchDialog extends JFrame implements ActionListener, ProgressList mEndDateField.addMouseListener(this); //ok button - mOkButton = new JButton("Ok"); + mOkButton = new JButton("Ok", new ImageIcon("images/database_search.png")); mOkButton.addActionListener(this); panel.add(mOkButton); diff --git a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/ShowAllDialog.java b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/ShowAllDialog.java index 8fe4f32..aa60c53 100644 --- a/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/ShowAllDialog.java +++ b/Order Processor/src/com/TwentyCodes/java/OrderProcessor/UI/ShowAllDialog.java @@ -12,6 +12,7 @@ import java.awt.event.ActionListener; import java.io.IOException; import java.sql.SQLException; +import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JProgressBar; @@ -35,7 +36,9 @@ public class ShowAllDialog extends JFrame implements ActionListener, ProgressLis public ShowAllDialog(){ super(); setTitle("Show All Orders"); - JButton ok = new JButton("Ok"); + setIconImage(new ImageIcon("images/database.png").getImage()); + + JButton ok = new JButton("Ok", new ImageIcon("images/accept.png")); ok.addActionListener(this); mOutput = new OrderPane(); mProgressBar = new JProgressBar(); @@ -79,8 +82,9 @@ public class ShowAllDialog extends JFrame implements ActionListener, ProgressLis public ShowAllDialog(String title, String body){ super(); setTitle(title); + setIconImage(new ImageIcon("images/info.png").getImage()); - JButton ok = new JButton("Ok"); + JButton ok = new JButton("Ok", new ImageIcon("images/accept.png")); ok.addActionListener(this); JScrollPane scrollPane = new JScrollPane();