Pccarmic

ProjectKickoffChecklist.md

@@ -1,29 +1,29 @@
 For each of you individually copy the checklist and check them of if it is done. This will be graded.
 
-<MyName>
+Paul Carmichael
 
-- [ ] Download and install Git
+- [X] Download and install Git
 
-- [ ] I have a GitHub account with a username that we can map to your real name
+- [X] I have a GitHub account with a username that we can map to your real name
 
-- [ ] Filled out the individual survey for group forming
+- [X] Filled out the individual survey for group forming
 
-- [ ] Received a Taiga invite
+- [X] Received a Taiga invite
 
-- [ ] Accepted the Taiga invite
+- [X] Accepted the Taiga invite
 
-- [ ] Do you check Slack regularly
+- [X] Do you check Slack regularly
 
-- [ ] Did you contact your team members
+- [X] Did you contact your team members
 
-- [ ] Did you read the kickoff document
+- [X] Did you read the kickoff document
 
-- [ ] Did you understand the kickoff document
+- [X] Did you understand the kickoff document
 
-- [ ] Did you make your three changes to the Memoranda software
+- [X] Did you make your three changes to the Memoranda software
 
-- [ ] Did you read the DeliverableX.md document and understand it (if you do not understand ask your team or me)
+- [X] Did you read the DeliverableX.md document and understand it (if you do not understand ask your team or me)
 
-- [ ] Did you read the QualityPolicy.md doument and understand it (if you do not understand ask your team or me)
+- [X] Did you read the QualityPolicy.md doument and understand it (if you do not understand ask your team or me)
 
-- [ ] You understand how to get started and what the next steps in my project are based on the kickoff document and what you learned about Scrum and GitHub (if you do not, ask on Slack until you do and can check this)
+- [X] You understand how to get started and what the next steps in my project are based on the kickoff document and what you learned about Scrum and GitHub (if you do not, ask on Slack until you do and can check this)

build.gradle

@@ -14,3 +14,35 @@ dependencies {
   implementation 'net.sourceforge.nekohtml:nekohtml:1.9.+'
 }
 
+jar {
+  manifest {
+    attributes "Main-Class": "main/java/memoranda/Start"
+  }
+
+  from {
+    configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+  }
+}
+
+task fatJar(type: Jar) {
+  manifest {
+    attributes 'Main-Class': 'main/java/memoranda/Start'
+  }
+  baseName = 'pccarmic_memoranda'
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+  from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
+  with jar
+}
+
+buildscript {
+  repositories {
+    mavenCentral()
+    gradlePluginPortal()
+  }
+  dependencies {
+    classpath "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
+  }
+}
+
+apply plugin: 'java'
+apply plugin: 'com.github.johnrengelman.shadow'

src/main/java/memoranda/ui/AgendaPanel.java

@@ -50,7 +50,7 @@ public class AgendaPanel extends JPanel {
 	JButton historyForwardB = new JButton();
 	JButton export = new JButton();
 	JEditorPane viewer = new JEditorPane("text/html", "");
-	String[] priorities = {"Muy Alta","Alta","Media","Baja","Muy Baja"};
+	String[] priorities = {"Highest","High","Medium","Low","Lowest"};
 	JScrollPane scrollPane = new JScrollPane();
 
 	DailyItemsPanel parentPanel = null;
@@ -126,7 +126,7 @@ else if (d.startsWith("memoranda:tasks")) {
 							CurrentStorage.get().storeEventsManager();
 						}
 						refresh(CurrentDate.get());
-						System.out.println("agregué un sticker");
+						System.out.println("I added a sticker");
 					} else if (d.startsWith("memoranda:expandsubtasks")) {
 						String id = d.split("#")[1];
 						gotoTask = id;
@@ -192,20 +192,20 @@ else if (d.startsWith("memoranda:tasks")) {
 						 }
 						 refresh(CurrentDate.get());
 					}else if (d.startsWith("memoranda:exportstickerst")) {
-						 /*  Falta agregar el exportar sticker mientras tanto..*/
+						 /*  Missing to add the export sticker in the meantime..*/
 						 final JFrame parent = new JFrame();
-						 String name = JOptionPane.showInputDialog(parent,Local.getString("Ingrese nombre de archivo a exportar"),null);
+						 String name = JOptionPane.showInputDialog(parent,Local.getString("Enter file name to export"),null);
 						 new ExportSticker(name).export("txt");
 						 //JOptionPane.showMessageDialog(null,name);
 					}else if (d.startsWith("memoranda:exportstickersh")) {
-						 /*  Falta agregar el exportar sticker mientras tanto..*/
+						 /*  Missing to add the export sticker in the meantime..*/
 						 final JFrame parent = new JFrame();
-						 String name = JOptionPane.showInputDialog(parent,Local.getString("Ingrese nombre de archivo a exportar"),null);
+						 String name = JOptionPane.showInputDialog(parent,Local.getString("Enter file name to export"),null);
 						 new ExportSticker(name).export("html");
 						 //JOptionPane.showMessageDialog(null,name);
 					}else if (d.startsWith("memoranda:importstickers")) {
 						final JFrame parent = new JFrame();
-						String name = JOptionPane.showInputDialog(parent,Local.getString("Ingrese nombre de archivo a importar"),null);
+						String name = JOptionPane.showInputDialog(parent,Local.getString("Enter file name to export"),null);
 						new ImportSticker(name).import_file();
 					}
 				}

src/main/java/memoranda/ui/EventsPanel.java

@@ -231,11 +231,11 @@ void editEventB_actionPerformed(ActionEvent e) {
                 EventsTable.EVENT);
 
         dlg.timeSpin.getModel().setValue(ev.getTime());
-        /*if (new CalendarDate(ev.getTime()).equals(CalendarDate.today())) 
+        /*if (new CalendarDate(ev.getTime()).equals(CalendarDate.today()))
             ((SpinnerDateModel)dlg.timeSpin.getModel()).setStart(new Date());
         else
         ((SpinnerDateModel)dlg.timeSpin.getModel()).setStart(CalendarDate.today().getDate());
-        ((SpinnerDateModel)dlg.timeSpin.getModel()).setEnd(CalendarDate.tomorrow().getDate());*/    
+        ((SpinnerDateModel)dlg.timeSpin.getModel()).setEnd(CalendarDate.tomorrow().getDate());*/
         dlg.textField.setText(ev.getText());
         int rep = ev.getRepeat();
         if (rep > 0) {

src/main/java/memoranda/ui/ExportSticker.java

@@ -69,12 +69,13 @@ public boolean export(String src){
                         fwrite.write(contents);
 
                         fwrite.close();
-                        JOptionPane.showMessageDialog(null,Local.getString("Documento creado con exito en su carpeta Memoranda =D"));
+                        JOptionPane.showMessageDialog(null,Local.getString("\n" +
+                                "Document successfully created in your Memoranda folder =D"));
 
 
         } catch (IOException e) {
             e.printStackTrace();
-            JOptionPane.showMessageDialog(null,Local.getString("NO Logramos crear su documento =(..."));
+            JOptionPane.showMessageDialog(null,Local.getString("We were NOT able to create your document =(..."));
         }
 
 

src/main/java/memoranda/ui/ImportSticker.java

@@ -19,7 +19,7 @@ public boolean import_file(){
 
                   */
 
-                JOptionPane.showMessageDialog(null,Local.getString("Aun no podemos importar su documento"));
+                JOptionPane.showMessageDialog(null,Local.getString("We still can't import your document"));
                 return true;
         }
 

src/main/java/memoranda/util/AgendaGenerator.java

@@ -367,7 +367,7 @@ static String generateStickers(CalendarDate date) {
 				.class
 				.getResource("/ui/agenda/removesticker.gif")
 				.toExternalForm();
-		 String s = "<hr><hr><table border=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td><a href=\"memoranda:importstickers\"><b>"+Local.getString("Importar anotaci�n")+"</b></a></td><td><a href=\"memoranda:exportstickerst\"><b>"+Local.getString("Exportar anotaci�n como .txt")+"</b></a><td><a href=\"memoranda:exportstickersh\"><b>"+Local.getString("Exportar anotaci�n como .html")+"</b></a></td></tr></table>"
+		 String s = "<hr><hr><table border=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td><a href=\"memoranda:importstickers\"><b>"+Local.getString("Import Annotation")+"</b></a></td><td><a href=\"memoranda:exportstickerst\"><b>"+Local.getString("Import Annotation With .txt")+"</b></a><td><a href=\"memoranda:exportstickersh\"><b>"+Local.getString("Import Annotation With .html")+"</b></a></td></tr></table>"
 				 +   "<table border=\"0\" cellpadding=\"0\" width=\"100%\"><tr><td><a href=\"memoranda:addsticker\"><img align=\"left\" width=\"22\" height=\"22\" src=\""				
 				 + iurl
 				+ "\" border=\"0\"  hspace=\"0\" vspace=\"0\" alt=\"New sticker\"></a></td><td width=\"100%\"><a href=\"memoranda:addsticker\"><b>&nbsp;"