More gui work, more testing to do.
authorJimmy Christensen <dusted@dusted.dk>
Tue, 5 Aug 2014 13:45:24 +0000 (15:45 +0200)
committerJimmy Christensen <dusted@dusted.dk>
Tue, 5 Aug 2014 13:45:24 +0000 (15:45 +0200)
Looking good, but somethings up with account-creation.

17 files changed:
src/fkgui/Animation.java
src/fkgui/FkManager.java
src/fkgui/MainWin.java
src/fkgui/Messages.java
src/fkgui/NewAccountDialog.java
src/fkgui/PermitCountDownDialog.java
src/fkgui/TriggerDialog.java
src/fkgui/gfx/ani/1.png [moved from src/fkgui/gfx/finalkey2.png with 60% similarity]
src/fkgui/gfx/ani/2.png [new file with mode: 0644]
src/fkgui/gfx/ani/3.png [new file with mode: 0644]
src/fkgui/gfx/ani/4.png [new file with mode: 0644]
src/fkgui/gfx/ani/5.png [new file with mode: 0644]
src/fkgui/gfx/ani/6.png [new file with mode: 0644]
src/fkgui/gfx/ani/7.png [new file with mode: 0644]
src/fkgui/gfx/finalkey1.png [deleted file]
src/fkgui/messages.properties
src/fkgui/messages_da.properties

index 84284e2..20444b0 100644 (file)
@@ -37,8 +37,15 @@ public class Animation extends Composite {
                fd_label.bottom = new FormAttachment(0, 32);
                fd_label.right = new FormAttachment(0, 32);
                label.setLayoutData(fd_label);
-               frames = new Vector<Image>(0);
+               frames = new Vector<Image>(7);
                setFPS(FPS);
+               addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/ani/1.png") ); //$NON-NLS-1$
+               addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/ani/2.png") ); //$NON-NLS-1$
+               addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/ani/3.png") ); //$NON-NLS-1$
+               addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/ani/4.png") ); //$NON-NLS-1$
+               addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/ani/5.png") ); //$NON-NLS-1$
+               addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/ani/6.png") ); //$NON-NLS-1$
+               addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/ani/7.png") ); //$NON-NLS-1$
        }
        
        public void setPlaying(Boolean state )
@@ -89,11 +96,11 @@ public class Animation extends Composite {
                // Disable the check that prevents subclassing of SWT components
        }
 
-       public void addFrame(Image image) {
+       private void addFrame(Image image) {
                frames.addElement(image);
        }
        
-       public void setFPS( float fps )
+       private void setFPS( float fps )
        {
                msDelay = (int)(1000.0 / fps);
        }
index 320aa32..8ca37b9 100644 (file)
@@ -26,6 +26,8 @@ public class FkManager implements ActionListener {
        private static FkManager instance = null;
        private SerialWorker com = null;
 
+       private Comparator<Account> sortMethod = null;
+       
        public class Account
        {
                public String name;
@@ -184,17 +186,32 @@ public class FkManager implements ActionListener {
        }
        
        
+       
+       private class SortByName implements Comparator<Account>
+       {
+               @Override
+               public int compare(Account o1, Account o2) {
+                       return o1.name.compareTo(o2.name);
+               }
+       }
+       
+       private class SortById implements Comparator<Account>
+       {
+               @Override
+               public int compare(Account o1, Account o2) {
+                       int a = Integer.valueOf(o1.num, 16);
+                       int b = Integer.valueOf(o2.num, 16);
+                       return( a - b );
+               }
+       }
+       
+       
+       
        public void listAddAcc(String num, String name)
        {
                list.addElement( new Account(num,name) );
-               list.sort( new Comparator<Account>() {
-
-                       @Override
-                       public int compare(Account o1, Account o2) {
-                               
-                               return o1.name.compareTo(o2.name);
-                       }
-               } );
+               
+               list.sort( sortMethod );
        }
        
        public void listClear()
@@ -432,5 +449,18 @@ public class FkManager implements ActionListener {
                
        }
 
+       public void sortById(boolean byId) {
+               if( byId )
+               {
+                       sortMethod = new SortById();
+               } else {
+                       sortMethod = new SortByName();
+               }
+               if(list != null )
+               {
+                       list.sort(sortMethod);
+               }
+       }
+
 
 }
index 378b420..9d7e1bb 100644 (file)
@@ -79,8 +79,9 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
 
        
        static final String PREF_PORT ="lastUsedPortPref"; //$NON-NLS-1$
-       static final String DEFAULT_DEVICE = "/dev/FinalKey"; //$NON-NLS-1$
+       static final String PREF_DEFAULT_DEVICE = "/dev/FinalKey"; //$NON-NLS-1$
        static final String PREF_AUTOHIDE = "hideMainWinAfterConnect"; //$NON-NLS-1$
+       private static final String PREF_SORT_BY_ID_KEY = Messages.MainWin_0;
        public Composite cmpConnect;
        private Composite cmpAccounts;
        ListViewer lstAccounts;
@@ -266,6 +267,8 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
                
                prefs = Preferences.userNodeForPackage(this.getClass());
                
+               FkManager.getInstance().sortById( prefs.getBoolean(PREF_SORT_BY_ID_KEY, false) );               
+               
 
                mySelf = this;
                shell.setLayout(new FillLayout(SWT.HORIZONTAL));
@@ -330,16 +333,18 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
                        }
                });
                
-               txtLog = new Text(cmpConnect, SWT.BORDER | SWT.V_SCROLL | SWT.MULTI);
+               txtLog = new Text(cmpConnect, SWT.BORDER | SWT.V_SCROLL | SWT.MULTI | SWT.WRAP);
                FormData fd_txtLog = new FormData();
+               fd_txtLog.top = new FormAttachment(btnConnect, 6);
                fd_txtLog.left = new FormAttachment(0, 10);
                fd_txtLog.right = new FormAttachment(100, -10);
                fd_txtLog.bottom = new FormAttachment(100, -10);
-               fd_txtLog.top = new FormAttachment(0, 58);
                txtLog.setLayoutData(fd_txtLog);
                txtLog.setEditable(false);
                
+               
                lblPort = new Label(cmpConnect, SWT.NONE);
+               lblPort.setAlignment(SWT.RIGHT);
                fd_btnConnect.top = new FormAttachment(lblPort, 0, SWT.TOP);
                FormData fd_lblPort = new FormData();
                fd_lblPort.right = new FormAttachment(0, 86);
@@ -356,8 +361,9 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
                fd_txtDev.left = new FormAttachment(0, 102);
                txtDev.setLayoutData(fd_txtDev);
                txtDev.setFont(SWTResourceManager.getFont("Cantarell", 9, SWT.NORMAL)); //$NON-NLS-1$
-               txtDev.setText( prefs.get(PREF_PORT, DEFAULT_DEVICE));
+               txtDev.setText( prefs.get(PREF_PORT, PREF_DEFAULT_DEVICE));
                lblPassword = new Label(cmpConnect, SWT.NONE);
+               lblPassword.setAlignment(SWT.RIGHT);
                FormData fd_lblPassword = new FormData();
                fd_lblPassword.right = new FormAttachment(0, 95);
                fd_lblPassword.top = new FormAttachment(0, 29);
@@ -387,8 +393,6 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
 
                
                animation.setVisible(false);
-               animation.addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/finalkey1.png") ); //$NON-NLS-1$
-               animation.addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/finalkey2.png") ); //$NON-NLS-1$
                animation.setPlaying(false);
                cmpConnect.setTabList(new Control[]{txtPsw, btnConnect});
                
@@ -400,17 +404,12 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
                shell.addShellListener( new ShellListener() {
                        
                        public void shellIconified(ShellEvent e) {
-                               // TODO Auto-generated method stub
-
                        }
 
                        public void shellDeiconified(ShellEvent e) {
-                               // TODO Auto-generated method stub
-                               
                        }
                        
                        public void shellDeactivated(ShellEvent e) {
-                               // TODO Auto-generated method stub
                        }
                        
                        public void shellClosed(ShellEvent e) {
@@ -418,7 +417,6 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
                        }
                        
                        public void shellActivated(ShellEvent e) {
-                               // TODO Auto-generated method stub
                                
                        }
                } );
@@ -449,7 +447,7 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
                        free--;
                        lstAccounts.add( a );
                                                        
-                       Menu menu = new Menu(a.name+" ["+a.num+"]"); //$NON-NLS-1$ //$NON-NLS-1$
+                       Menu menu = new Menu(a.name+" ["+a.num+"]"); //$NON-NLS-1$ //$NON-NLS-1$ //$NON-NLS-2$
                        MenuItem both = new MenuItem(Messages.MainWin_25);
                        MenuItem usr = new MenuItem(Messages.MainWin_26);
                        MenuItem psw = new MenuItem(Messages.MainWin_27);
@@ -600,9 +598,8 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
                        }
                });
                FormData fd_btnNewAccoount = new FormData();
-               fd_btnNewAccoount.left = new FormAttachment(0, 530);
+               fd_btnNewAccoount.bottom = new FormAttachment(100, -6);
                fd_btnNewAccoount.right = new FormAttachment(100, -10);
-               fd_btnNewAccoount.bottom = new FormAttachment(100, -10);
                btnNewAccoount.setLayoutData(fd_btnNewAccoount);
                btnNewAccoount.setText(Messages.MainWin_47);
                
@@ -610,30 +607,50 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
                lblNumFree.setText("Hello World!"); //$NON-NLS-1$
                
                FormData fd_lblNumFree = new FormData();
-               fd_lblNumFree.left = new FormAttachment(0,0);
-               fd_lblNumFree.bottom = new FormAttachment(100,-10);
+               fd_lblNumFree.bottom = new FormAttachment(btnNewAccoount, 0, SWT.BOTTOM);
+               fd_lblNumFree.right = new FormAttachment(0, 133);
                lblNumFree.setLayoutData(fd_lblNumFree);
                
                
                lstAccounts = new ListViewer(cmpAccounts, SWT.BORDER | SWT.V_SCROLL);
                List list = lstAccounts.getList();
+               fd_lblNumFree.left = new FormAttachment(list, 0, SWT.LEFT);
                list.setLayoutData(new FormData());
                FormData fd_lstAccounts = new FormData();
                fd_lstAccounts.bottom = new FormAttachment(btnNewAccoount, -6);
                
                btnActivateAccount = new Button(cmpAccounts, SWT.NONE);
-               btnActivateAccount.setImage(SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/lightbulb.png"));
+               fd_btnNewAccoount.left = new FormAttachment(btnActivateAccount, 6);
+               btnActivateAccount.setImage(SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/lightbulb.png")); //$NON-NLS-1$
                FormData fd_btnActivateAccount = new FormData();
-               fd_btnActivateAccount.right = new FormAttachment(btnNewAccoount, -71);
-               fd_btnActivateAccount.left = new FormAttachment(lblNumFree, 78);
-               fd_btnActivateAccount.top = new FormAttachment(btnNewAccoount, 0, SWT.TOP);
+               fd_btnActivateAccount.right = new FormAttachment(100, -169);
+               fd_btnActivateAccount.top = new FormAttachment(0, 546);
+               fd_btnActivateAccount.bottom = new FormAttachment(100, -6);
                btnActivateAccount.setLayoutData(fd_btnActivateAccount);
-               btnActivateAccount.setText(Messages.MainWin_btnNewButton_text);
                fd_lstAccounts.top = new FormAttachment(0, 10);
                fd_lstAccounts.left = new FormAttachment(0, 10);
                fd_lstAccounts.right = new FormAttachment(100, -10);
                btnActivateAccount.setVisible(false);
                
+               Button btnByAccountId = new Button(cmpAccounts, SWT.CHECK);
+               fd_btnActivateAccount.left = new FormAttachment(btnByAccountId, 6);
+               btnByAccountId.addSelectionListener(new SelectionAdapter() {
+                       @Override
+                       public void widgetSelected(SelectionEvent e) {
+                               Button btnAccId = (Button)e.getSource();
+                               FkManager.getInstance().sortById( btnAccId.getSelection() );
+                               prefs.putBoolean( PREF_SORT_BY_ID_KEY, btnAccId.getSelection() );
+                               updateAccountList();
+                       }
+               });
+               FormData fd_btnByAccountId = new FormData();
+               fd_btnByAccountId.left = new FormAttachment(100, -541);
+               fd_btnByAccountId.bottom = new FormAttachment(100, -6);
+               fd_btnByAccountId.right = new FormAttachment(100, -381);
+               btnByAccountId.setLayoutData(fd_btnByAccountId);
+               btnByAccountId.setText(Messages.MainWin_btnByAccountId_text);
+               btnByAccountId.setSelection( prefs.getBoolean( PREF_SORT_BY_ID_KEY, false));
+               
                
                //lstAccounts.setLayoutData(fd_lstAccounts);
                lstAccounts.getControl().setLayoutData(fd_lstAccounts);
@@ -646,22 +663,15 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
                                if( !selection.isEmpty() )
                                {
                                        Account acc = (Account)selection.getFirstElement();
-                                       TriggerDialog diag = new TriggerDialog(shell, shell.getStyle(), acc, mySelf );
-
-                                       shell.setMinimized(true);
-                                       shell.setEnabled(false);
-                                       if( !((Boolean)diag.open()) )
-                                       {
-                                               shell.setMinimized(false);
-                                       }
-                                       
-                                       shell.setEnabled(true);
+                                       showTrigDialog(acc);
                                } else {
                                        System.out.println("Selected nothing."); //$NON-NLS-1$
                                }
                                
                                
                        }
+
+
                });
                
                lstAccounts.addSelectionChangedListener( new ISelectionChangedListener() {
@@ -675,10 +685,10 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
                                        btnActivateAccount.setVisible(true);
                                        btnActivateAccount.setText(acc.name);
                                        
+                                       //Remove any listeners
                                        for( Listener s :btnActivateAccount.getListeners(SWT.Selection) )
                                        {
                                                btnActivateAccount.removeListener(SWT.Selection, s);
-
                                        }
                                        
                                        btnActivateAccount.addSelectionListener( new SelectionListener() {
@@ -688,16 +698,7 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
                                                        
                                                        StructuredSelection selection = (StructuredSelection) lstAccounts.getSelection();
                                                        Account acc = (Account)selection.getFirstElement();
-                                                       TriggerDialog diag = new TriggerDialog(shell, shell.getStyle(), acc, mySelf );
-
-                                                       shell.setMinimized(true);
-                                                       shell.setEnabled(false);
-                                                       if( !((Boolean)diag.open()) )
-                                                       {
-                                                               shell.setMinimized(false);
-                                                       }
-                                                       
-                                                       shell.setEnabled(true);
+                                                       showTrigDialog(acc);
                                                }
                                                
                                                @Override
@@ -714,6 +715,19 @@ public class MainWin implements ConsoleMsg, AutoUpdaterResultListener {
                                
        }
 
+       private void showTrigDialog(Account acc) {
+               TriggerDialog diag = new TriggerDialog(shell, shell.getStyle(), acc, mySelf );
+
+               shell.setMinimized(true);
+               shell.setEnabled(false);
+               if( !((Boolean)diag.open()) )
+               {
+                       shell.setMinimized(false);
+               }
+               
+               shell.setEnabled(true);
+               
+       }
 
        @Override
        public void updateCheckFinished(AutoUpdaterResultEvent event) {
index 3191d63..a82feb6 100644 (file)
@@ -4,6 +4,7 @@ import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
        private static final String BUNDLE_NAME = "fkgui.messages"; //$NON-NLS-1$
+       public static String MainWin_0;
        public static String MainWin_12;
        public static String MainWin_15;
        public static String MainWin_18;
@@ -135,7 +136,7 @@ public class Messages extends NLS {
        public static String TriggerDialog_6;
        public static String TriggerDialog_7;
        public static String TriggerDialog_8;
-       public static String MainWin_btnNewButton_text;
+       public static String MainWin_btnByAccountId_text;
        static {
                // initialize resource bundle
                NLS.initializeMessages(BUNDLE_NAME, Messages.class);
index 3f7f65f..5902556 100644 (file)
@@ -837,8 +837,6 @@ public class NewAccountDialog extends Dialog implements FkActionEventListener {
                animation.setLayoutData(fd_animation);
                animation.setBounds(10, 32, 32, 32);
                animation.setVisible(true);
-               animation.addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/finalkey1.png") ); //$NON-NLS-1$
-               animation.addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/finalkey2.png") ); //$NON-NLS-1$
                animation.setPlaying(true);
 
        }
index f9c0728..5443d1a 100644 (file)
@@ -57,14 +57,11 @@ public class PermitCountDownDialog extends Dialog {
                lblMsg.setText(msg);
                
                lblTimeLeft = new Label(shell, SWT.NONE);
-               lblTimeLeft.setText("    "); //$NON-NLS-1$
                lblTimeLeft.setBounds(48, 56, 201, 32);
                
                Animation animation = new Animation(shell, SWT.NONE, 4);
                animation.setBounds(10, 32, 32, 32);
                animation.setVisible(true);
-               animation.addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/finalkey1.png") ); //$NON-NLS-1$
-               animation.addFrame( SWTResourceManager.getImage(MainWin.class, "/fkgui/gfx/finalkey2.png") ); //$NON-NLS-1$
                animation.setPlaying(true);
                
                
index 80bfc0b..8a620ea 100644 (file)
@@ -273,12 +273,12 @@ public class TriggerDialog extends Dialog implements FkActionEventListener {
                        result = (Object)new Boolean(true);
                        if( event.action == 's' )
                        {
-                               int begin = event.data.lastIndexOf("Account: "+ event.acc.num);
+                               int begin = event.data.lastIndexOf("Account: "+ event.acc.num); //$NON-NLS-1$
                                if( begin == -1 )
                                {
                                        begin=0;
                                }
-                               int end = event.data.lastIndexOf("[done]");
+                               int end = event.data.lastIndexOf("[done]"); //$NON-NLS-1$
                                String s = event.data.substring( begin,end  );
                                dialog = new MessageBox(shell, SWT.ICON_INFORMATION | SWT.OK);
                                dialog.setText(Messages.TriggerDialog_39);
similarity index 60%
rename from src/fkgui/gfx/finalkey2.png
rename to src/fkgui/gfx/ani/1.png
index fa3dcd0..d8d471e 100644 (file)
Binary files a/src/fkgui/gfx/finalkey2.png and b/src/fkgui/gfx/ani/1.png differ
diff --git a/src/fkgui/gfx/ani/2.png b/src/fkgui/gfx/ani/2.png
new file mode 100644 (file)
index 0000000..b086430
Binary files /dev/null and b/src/fkgui/gfx/ani/2.png differ
diff --git a/src/fkgui/gfx/ani/3.png b/src/fkgui/gfx/ani/3.png
new file mode 100644 (file)
index 0000000..ca4a87f
Binary files /dev/null and b/src/fkgui/gfx/ani/3.png differ
diff --git a/src/fkgui/gfx/ani/4.png b/src/fkgui/gfx/ani/4.png
new file mode 100644 (file)
index 0000000..0481760
Binary files /dev/null and b/src/fkgui/gfx/ani/4.png differ
diff --git a/src/fkgui/gfx/ani/5.png b/src/fkgui/gfx/ani/5.png
new file mode 100644 (file)
index 0000000..112b664
Binary files /dev/null and b/src/fkgui/gfx/ani/5.png differ
diff --git a/src/fkgui/gfx/ani/6.png b/src/fkgui/gfx/ani/6.png
new file mode 100644 (file)
index 0000000..128d455
Binary files /dev/null and b/src/fkgui/gfx/ani/6.png differ
diff --git a/src/fkgui/gfx/ani/7.png b/src/fkgui/gfx/ani/7.png
new file mode 100644 (file)
index 0000000..8de2fb7
Binary files /dev/null and b/src/fkgui/gfx/ani/7.png differ
diff --git a/src/fkgui/gfx/finalkey1.png b/src/fkgui/gfx/finalkey1.png
deleted file mode 100644 (file)
index 52838a4..0000000
Binary files a/src/fkgui/gfx/finalkey1.png and /dev/null differ
index 74321a3..a3d376a 100644 (file)
@@ -1,5 +1,6 @@
 #Eclipse modern messages class
-#Tue Aug 05 13:42:16 CEST 2014
+#Tue Aug 05 15:04:40 CEST 2014
+MainWin_0=sortAccountListById
 MainWin_12=Connection
 MainWin_15=Connect
 MainWin_18=Password
@@ -26,7 +27,7 @@ MainWin_53=\ available.
 MainWin_54=There's a new version of FinalKey GUI available.\nGo to http\://cyberstalker.dk/finalkey/gui/ to download.\n\nNews\:\n
 MainWin_7=Show FinalKey
 MainWin_8=Hide FinalKey
-MainWin_btnNewButton_text=New Button
+MainWin_btnByAccountId_text=By account id
 NewAccountDialog_10=Next up\: Setting a safe password\!\nYou have two options\: Manually enter a password or to\nhave The Final Key generate a strong and random password,\nit is strongly recommended to let The Final Key generate a\nrandom password, select the longest that is allowed by the service.
 NewAccountDialog_11=Automatic
 NewAccountDialog_12=Manual Entry
@@ -103,7 +104,7 @@ TriggerDialog_0=Use
 TriggerDialog_1=Returning result\:
 TriggerDialog_10=Username
 TriggerDialog_11=\: Ready with password
-TriggerDialog_12=Focus password field and press button.\nPress and hold to cancel.
+TriggerDialog_12=Focus password field and press FinalKey Switch.\nPress and hold to cancel.
 TriggerDialog_14=Password
 TriggerDialog_15=Change 
 TriggerDialog_17=Edit
@@ -120,15 +121,15 @@ TriggerDialog_28=Do nothing
 TriggerDialog_29=Show 
 TriggerDialog_3=\: Ready with username and password
 TriggerDialog_30=\: Ready for display
-TriggerDialog_31=Press button to show username and password.\nPress and hold to cancel.
+TriggerDialog_31=Press FinalKey Switch to show username and password.\nPress and hold to cancel.
 TriggerDialog_33=Show Username + Password
 TriggerDialog_34=Action aborted or timed out.
 TriggerDialog_35=\ error
 TriggerDialog_36=An error ocurred.
 TriggerDialog_39=Account information
-TriggerDialog_4=Focus username field and press button.\nPress and hold to cancel.
+TriggerDialog_4=Focus username field and press FinalKey Switch.\nPress and hold to cancel.
 TriggerDialog_40=Account deleted
 TriggerDialog_41=\ has been erased.
 TriggerDialog_6=Username + Password
 TriggerDialog_7=\: Ready with username
-TriggerDialog_8=Focus username field and press button.\nPress and hold to cancel.
+TriggerDialog_8=Focus username field and press FinalKey Switch.\nPress and hold to cancel.
index 63b7aea..49c558b 100644 (file)
@@ -24,6 +24,7 @@ MainWin_53=\ tilg
 MainWin_54=En ny version af softwaren kan nu hentes.\nGå til http://cyberstalker.dk/finalkey/gui/ for download.\n\nNyt:\n
 MainWin_7=Vis FinalKey
 MainWin_8=Skjul FinalKey
+MainWin_btnByAccountId_text=Efter kontoid
 NewAccountDialog_10=Næste trin: Lav en sikker kode\!\nDu har to muligheder: Indtast selv en kode\neller lad Final Key lave en sikker kode automatisk,\ndet anbefales at lade Final Key lave tilfældig kode.
 NewAccountDialog_11=Automatisk
 NewAccountDialog_12=Indtast selv
@@ -56,7 +57,7 @@ NewAccountDialog_38=Forrige
 NewAccountDialog_39=Gem
 NewAccountDialog_4=Opret ny konto.\nStart med at vælge et navn til den nye konto\nfor eksempel navnet på den service der skal logges på.\nKontonavnet bliver vist i listen med konti.
 NewAccountDialog_40=Klar til start
-NewAccountDialog_41=Når du trykker OK begynder Final Key at blinke, du har 5 sekunder til at trykke på knappen for at tillade at kontoen bliver gemt.
+NewAccountDialog_41=Når du trykker OK begynder Final Key at blinke, du har 5 sekunder til at trykke på FinalKey Knap for at tillade at kontoen bliver gemt.
 NewAccountDialog_42=Automatisk, 
 NewAccountDialog_43=\ lang, 
 NewAccountDialog_44=alle symboler
@@ -69,7 +70,7 @@ NewAccountDialog_51=Arbejder...
 NewAccountDialog_54=Opret Ny Konto
 NewAccountDialog_55=Fejl 01.
 NewAccountDialog_56=Konto blev ikke oprettet
-NewAccountDialog_57=Kontoen blev ikke oprettet.\nMåske nåede du ikke at trykke på knappen på FinalKey?\nPrøv igen.
+NewAccountDialog_57=Kontoen blev ikke oprettet.\nMåske nåede du ikke at trykke på FinalKey Knap?\nPrøv igen.
 NewAccountDialog_58=Fejl 02.
 NewAccountDialog_59=Fejl 03
 NewAccountDialog_6=Brugernavnet som Final Key skal taste ind\nnår der logges på. Typisk en E-Mail adresse.
@@ -77,7 +78,7 @@ NewAccountDialog_60=Der skete en fejl ved oprettelsen, genstart og pr
 NewAccountDialog_61=Konto Gemt.
 NewAccountDialog_62=Kontoen blev Gemt.
 NewAccountDialog_63=Kontoen blev Gemt.
-NewAccountDialog_64=Tryk på knappen på Final Key
+NewAccountDialog_64=Tryk på FinalKey Knap
 NewAccountDialog_65=Gemmer...
 NewAccountDialog_7=Brugernavn:
 NewAccountDialog_8=Fortryd
@@ -92,7 +93,7 @@ SerialWorker_16=Fejl ved hentning af kontoliste
 SerialWorker_2=Parametre sat: 
 SerialWorker_23=\n* Brug FinalKey ikonet i systembakken til at logge ind *
 SerialWorker_3=Understøttet sprog:
-SerialWorker_4=\n* Tryk knappen på Final Key *
+SerialWorker_4=\n* Tryk på FinalKey Knap *
 SerialWorker_5=Fejl 04, prøv igen
 SerialWorker_7=Logger ind.
 SerialWorker_8=Fejl: Fjern Final Key fra computere og tilslut den igen, prøv igen.
@@ -100,7 +101,7 @@ TriggerDialog_0=Brug
 TriggerDialog_1=Resultat:
 TriggerDialog_10=Brugernavn
 TriggerDialog_11=: Klar med kode
-TriggerDialog_12=Sæt cursor i kode feltet og tryk på knappen.\nHold knappen inde for at fortryde.
+TriggerDialog_12=Set cursor i kode feltet og tryk på FinalKey Knap\nHold den inde for at fortryde.
 TriggerDialog_14=Kode
 TriggerDialog_15=Lav om på 
 TriggerDialog_17=Rediger
@@ -110,22 +111,22 @@ TriggerDialog_2=Brug
 TriggerDialog_20=\ ?\nKonto id: 
 TriggerDialog_21=\nHvis du fjerner kontoen kan den ikke genskabes\!
 TriggerDialog_22=: Bekræft sletning
-TriggerDialog_23=Tryk for at slette  
-TriggerDialog_24=.\nHold knappen inde for at fortryde.
+TriggerDialog_23=Tryk FinalKey Knap for at slette 
+TriggerDialog_24=.\nHold den inde for at fortryde.
 TriggerDialog_26=Slet
 TriggerDialog_28=Fortryd
 TriggerDialog_29=Vis 
 TriggerDialog_3=: Klar med brugernavn og kode
 TriggerDialog_30=: Klar til vise
-TriggerDialog_31=Tryk for at vise brugernavn og kode.\nHold knappen inde for at fortryde.
+TriggerDialog_31=Tryk på FinalKey Knap for at vise kontoen\nHold den inde for at fortryde.
 TriggerDialog_33=Vis brugernavn og kode
 TriggerDialog_34=Handlingen blev fortrudt eller der blev ikke trykket på knappen.
 TriggerDialog_35=\ fejl
 TriggerDialog_36=Der opstod en fejl.
 TriggerDialog_39=Konto oplysninger
-TriggerDialog_4=Set cursor i brugernavn feltet og tryk\nHold knappen inde for at fortryde.
+TriggerDialog_4=Set cursor i brugernavn feltet og tryk på FinalKey Knap\nHold den inde for at fortryde.
 TriggerDialog_40=Konto slettet
 TriggerDialog_41=\ er blevet slettet.
 TriggerDialog_6=Brugernavn + Kode
 TriggerDialog_7=: Klar med brugernavn
-TriggerDialog_8=Set cursor i brugernavn feltet og tryk\nHold knappen inde for at fortryde.
+TriggerDialog_8=Set cursor i brugernavn feltet og tryk på FinalKey Knap\nHold den inde for at fortryde.