Modified: Sources/TranstoolClient/Communications/TranstoolConnection.hx
===================================================================
--- Sources/TranstoolClient/Communications/TranstoolConnection.hx 2006-11-24 09:27:07 UTC (rev 512)
+++ Sources/TranstoolClient/Communications/TranstoolConnection.hx 2006-11-24 13:49:57 UTC (rev 513)
@@ -554,5 +554,3 @@
}
}
-
-
Modified: Sources/TranstoolClient/Dialogs/FilterDlg.hx
===================================================================
--- Sources/TranstoolClient/Dialogs/FilterDlg.hx 2006-11-24 09:27:07 UTC (rev 512)
+++ Sources/TranstoolClient/Dialogs/FilterDlg.hx 2006-11-24 13:49:57 UTC (rev 513)
@@ -134,11 +134,11 @@
original_text_chb.setFont(GuiConsts.STANDART_FONT);
original_text_chb.setHorizontalAlignment(JLabel.LEFT);
original_text_chb.addEventListener(org.aswing.AbstractButton.ON_SELECTION_CHANGED, onSelectionChanged);
- original_text_cb = new JComboBox([ONE_OF, ALL/*, NONE*/]);
+ original_text_cb = new JComboBox([ONE_OF, ALL, NONE]);
original_text_cb.setSelectedIndex(0);
original_text_cb.addActionListener(onOriginalTextTypesCBChanged, this);
original_text_cb.setFont(GuiConsts.STANDART_FONT);
- original_text_cb.setPreferredSize(new Dimension(70, original_text_cb.getPreferredSize().height));
+ original_text_cb.setPreferredSize(new Dimension(75, original_text_cb.getPreferredSize().height));
original_text_cb.setHorizontalAlignment(org.aswing.AbstractButton.RIGHT);
original_text_cb.setEnabled(false);
var selected_original_text_status = new JLabel(SELECTED_TYPES);
@@ -190,10 +190,10 @@
review_chb.setFont(GuiConsts.STANDART_FONT);
review_chb.setHorizontalAlignment(JLabel.LEFT);
review_chb.addEventListener(org.aswing.AbstractButton.ON_SELECTION_CHANGED, onSelectionChanged);
- review_cb = new JComboBox([ONE_OF, ALL/*, NONE*/]);
+ review_cb = new JComboBox([ONE_OF, ALL, NONE]);
review_cb.setSelectedIndex(0);
review_cb.setFont(GuiConsts.STANDART_FONT);
- review_cb.setPreferredSize(new Dimension(70, review_cb.getPreferredSize().height));
+ review_cb.setPreferredSize(new Dimension(75, review_cb.getPreferredSize().height));
review_cb.setHorizontalAlignment(org.aswing.AbstractButton.RIGHT);
review_cb.setEnabled(false);
var selected_review_status = new JLabel(VERIFICATION);
@@ -361,7 +361,9 @@
for (flag in filter.original_text_types) {
original_text_chbg.changeSelectionByText(Flag.originalFlagToString(flag), true);
}
- if (filter.original_text_types_and) {
+ if (filter.not_original_text_types) {
+ original_text_cb.setSelectedIndex(2);
+ } else if (filter.original_text_types_and) {
original_text_cb.setSelectedIndex(1);
} else {
original_text_cb.setSelectedIndex(0);
@@ -382,7 +384,9 @@
for (flag in filter.review_status) {
review_chbg.changeSelectionByText(Flag.reviewFlagToString(flag), true);
}
- if (filter.review_status_and) {
+ if (filter.not_review_status) {
+ review_cb.setSelectedIndex(2);
+ } else if (filter.review_status_and) {
review_cb.setSelectedIndex(1);
} else {
review_cb.setSelectedIndex(0);
@@ -419,7 +423,21 @@
var filter = new Filter();
filter.original_text_types = new Array();
if (original_text_chb.isSelected() && original_text_chbg.getSelection().length > 0) {
- filter.original_text_types_and = (original_text_cb.getSelectedIndex() == 1);
+ switch (original_text_cb.getSelectedIndex()) {
+ case 2: {
+ filter.original_text_types_and = true;
+ filter.not_original_text_types = true;
+ }
+ case 1: {
+ filter.original_text_types_and = false;
+ filter.not_original_text_types = true;
+ }
+ case 0: {
+ filter.original_text_types_and = false;
+ filter.not_original_text_types = false;
+ }
+ default : trace("unknown selecteion");
+ }
for (text in original_text_chbg.getSelectedTextValues()) {
filter.original_text_types.push(Flag.getOriginalFlagByText(text));
}
@@ -432,7 +450,21 @@
}
filter.review_status = new Array();
if (review_chb.isSelected() && review_chbg.getSelection().length > 0) {
- filter.review_status_and = (review_cb.getSelectedIndex() == 1);
+ switch (review_cb.getSelectedIndex()) {
+ case 2: {
+ filter.not_review_status = true;
+ filter.review_status_and = true;
+ }
+ case 1: {
+ filter.not_review_status = false;
+ filter.review_status_and = true;
+ }
+ case 0: {
+ filter.not_review_status = false;
+ filter.review_status_and = false;
+ }
+ default : trace("unknown selecteion");
+ }
for (text in review_chbg.getSelectedTextValues()) {
filter.review_status.push(Flag.getReviewFlagByText(text));
}
Modified: Sources/TranstoolClient/Dialogs/QuickFilterDialog.hx
===================================================================
--- Sources/TranstoolClient/Dialogs/QuickFilterDialog.hx 2006-11-24 09:27:07 UTC (rev 512)
+++ Sources/TranstoolClient/Dialogs/QuickFilterDialog.hx 2006-11-24 13:49:57 UTC (rev 513)
@@ -41,6 +41,7 @@
one_filter_cb_item("all", null, null),
one_filter_cb_item("only not translated", not_translated, null),
one_filter_cb_item("only not completed", not_completed, null),
+ one_filter_cb_item("only completed", completed, null),
one_filter_cb_item("only not verified", null, null),//TODO
one_filter_cb_item("only generally verified", null, generally_verified),
one_filter_cb_item("only medically verified", null, medically_verified),
@@ -56,7 +57,7 @@
search_cb_items = [
one_search_cb_item("original", true, false),
one_search_cb_item("translation", false, true),
- one_search_cb_item("original or translation", true, true)//TODO
+ //one_search_cb_item("original or translation", true, true)//TODO
];
}
@@ -112,12 +113,12 @@
return true;
}
- private static function setFilterFlags(transtoolFlag:TranslationFlag, reviewFlag:ReviewFlag) {
+ private static function setFilterFlags (transtoolFlag : TranslationFlag, reviewFlag : ReviewFlag) {
var filter = TranstoolClient.app.model.filter;
filter.translation_status = if (transtoolFlag != null) [transtoolFlag] else [];
filter.review_status = if (reviewFlag != null) [reviewFlag] else [];
- TranstoolClient.app.changeFilter(filter);
+ TranstoolClient.app.changeFilter(filter, true);
}
private function checkFilterText(original:Bool, translation:Bool) {
@@ -153,13 +154,13 @@
}
setEnableSearch(true);
- TranstoolClient.app.changeFilter(filter);
+ TranstoolClient.app.changeFilter(filter, true);
}
public function createPanel() {
var quick_filter_panel = new JPanel(new FlowLayout(FlowLayout.LEFT, 10));
- quick_filter_panel.append(createLabel("Shows"));
+ quick_filter_panel.append(createLabel("Show"));
var me = this;
filter_cb = new AdvancedComboBox(Lambda.amap(filter_cb_items, function(item) {return {text:item.text, func:item.func};}));
@@ -180,6 +181,7 @@
me.search_cb.getSelectedItem().func();
}, this);
quick_filter_panel.append(search_ta);
+
return quick_filter_panel;
}
@@ -217,7 +219,7 @@
filter.translation_status = translations;
filter.review_status = reviews;
filter.review_status_and = review_status_and;
- TranstoolClient.app.changeFilter(filter);
+ TranstoolClient.app.changeFilter(filter, true);
},
checkFunc: function() {
var filter = TranstoolClient.app.model.filter;
@@ -234,7 +236,7 @@
private function searchToText() {
var filter = TranstoolClient.app.model.filter;
- if ( filter.original_text_string == filter.translation_string ) {
+ if ( filter.original_text_string == filter.translation_string && filter.original_text_string != '') {
return "original and translation contains '" + filter.original_text_string + "'";
}
@@ -263,7 +265,7 @@
filter.original_text_string = original;
filter.translation_string = translation;
me.setEnableSearch(false);
- TranstoolClient.app.changeFilter(filter);
+ TranstoolClient.app.changeFilter(filter, true);
},
checkFunc: function() {
var filter = TranstoolClient.app.model.filter;
Modified: Sources/TranstoolClient/Dialogs/RegisterDlg.hx
===================================================================
--- Sources/TranstoolClient/Dialogs/RegisterDlg.hx 2006-11-24 09:27:07 UTC (rev 512)
+++ Sources/TranstoolClient/Dialogs/RegisterDlg.hx 2006-11-24 13:49:57 UTC (rev 513)
@@ -177,7 +177,7 @@
var languages_pl : JPanel = new JPanel();
languages_pl.setLayout ( new FlowLayout ( FlowLayout.LEFT ) );
- var language_lbl : JLabel = ASwing.createLabel( DEFAULT_LANGUAGE );
+ var language_lbl : JLabel = new JLabel( DEFAULT_LANGUAGE );
language_lbl.setFont( new ASFont( FONT_NAME, FONT_SIZE ) );
language_lbl.setPreferredSize ( new Dimension ( 70 , 22 ) );
language_lbl.setHorizontalAlignment ( JLabel.LEFT );
Modified: Sources/TranstoolClient/Dialogs/TranstoolFrame.hx
===================================================================
--- Sources/TranstoolClient/Dialogs/TranstoolFrame.hx 2006-11-24 09:27:07 UTC (rev 512)
+++ Sources/TranstoolClient/Dialogs/TranstoolFrame.hx 2006-11-24 13:49:57 UTC (rev 513)
@@ -864,12 +864,17 @@
model.setCurrentProduct(index + 1);
}
- public function changeFilter(filter : Filter) {
+ public function changeFilter(filter : Filter, ?from_quick_filter : Bool) {
+ if (null == from_quick_filter) {
+ from_quick_filter = false;
+ }
saveData();
enableControls(false);
setTranslation(null);
model.applyFilter(filter);
- //quick_filter.updateFilter();
+ if (!from_quick_filter) {
+ quick_filter.updateFilter();
+ }
}
private function onKeyDown() {
Modified: Sources/TranstoolClient/GUI/ListBox/OverviewListCellFactory.hx
===================================================================
--- Sources/TranstoolClient/GUI/ListBox/OverviewListCellFactory.hx 2006-11-24 09:27:07 UTC (rev 512)
+++ Sources/TranstoolClient/GUI/ListBox/OverviewListCellFactory.hx 2006-11-24 13:49:57 UTC (rev 513)
@@ -1,6 +1,5 @@
package gui.listbox;
-import ASwing;
import org.aswing.ListCellFactory;
import org.aswing.DefaultListCell;
import gui.listbox.OverviewListCell;
Modified: Sources/TranstoolClient/GUI/ListBox/originalListCellFactory.hx
===================================================================
--- Sources/TranstoolClient/GUI/ListBox/originalListCellFactory.hx 2006-11-24 09:27:07 UTC (rev 512)
+++ Sources/TranstoolClient/GUI/ListBox/originalListCellFactory.hx 2006-11-24 13:49:57 UTC (rev 513)
@@ -1,6 +1,5 @@
package gui.listbox;
-import ASwing;
import org.aswing.ListCellFactory;
import org.aswing.DefaultListCell;
import gui.listbox.OriginalListCell;
Modified: Sources/TranstoolClient/GUI/ListBox/translationTextHistoryListCellFactory.hx
===================================================================
--- Sources/TranstoolClient/GUI/ListBox/translationTextHistoryListCellFactory.hx 2006-11-24 09:27:07 UTC (rev 512)
+++ Sources/TranstoolClient/GUI/ListBox/translationTextHistoryListCellFactory.hx 2006-11-24 13:49:57 UTC (rev 513)
@@ -1,6 +1,5 @@
package gui.listbox;
-import ASwing;
import org.aswing.ListCellFactory;
import org.aswing.DefaultListCell;
import gui.listbox.OriginalListCell;
Modified: Sources/TranstoolClient/GUI/Ribbon/TranstoolRibbon.hx
===================================================================
--- Sources/TranstoolClient/GUI/Ribbon/TranstoolRibbon.hx 2006-11-24 09:27:07 UTC (rev 512)
+++ Sources/TranstoolClient/GUI/Ribbon/TranstoolRibbon.hx 2006-11-24 13:49:57 UTC (rev 513)
@@ -127,7 +127,7 @@
private function createAllPanel() : JPanel {
var all_pnl : JPanel = new JPanel(new SoftBoxLayout(SoftBoxLayout.X_AXIS, 5));
- var language_lbl : JLabel = ASwing.createLabel(LANGUAGE);
+ var language_lbl : JLabel =new JLabel(LANGUAGE);
language_lbl.setFont(FONT);
languages_cb = new JComboBox(null);
languages_cb.setFont(FONT);
@@ -180,7 +180,7 @@
imex_btn.setFont(FONT);
imex_btn.addEventListener(org.aswing.Component.ON_PRESS, onImExHandler);
all_modes_pnl.append(imex_btn);
- var product_lbl : JLabel = ASwing.createLabel(PRODUCT);
+ var product_lbl : JLabel = new JLabel(PRODUCT);
product_lbl.setFont(FONT);
all_modes_pnl.append(product_lbl);
all_modes_pnl.setBorder(new org.aswing.border.EmptyBorder(null, new org.aswing.Insets(0, 0, 0, 20)));
Modified: Sources/TranstoolClient/Models/Filter.hx
===================================================================
--- Sources/TranstoolClient/Models/Filter.hx 2006-11-24 09:27:07 UTC (rev 512)
+++ Sources/TranstoolClient/Models/Filter.hx 2006-11-24 13:49:57 UTC (rev 513)
@@ -14,6 +14,8 @@
public var date(default, default) : Float;
public var and_original_tags(default, default) : Bool;
public var and_review_tags(default, default) : Bool;
+ public var not_original_tags(default, default) : Bool;
+ public var not_review_tags(default, default) : Bool;
public function new(){
roles = new Array();
@@ -23,6 +25,8 @@
original_text_string = '';
and_original_tags = false;
and_review_tags = false;
+ not_original_tags = false;
+ not_review_tags = false;
id_language = -1;
date = null;
}
@@ -41,6 +45,8 @@
public var date(default, default) : Date;
public var original_text_types_and(default, default) : Bool;
public var review_status_and(default, default) : Bool;
+ public var not_original_text_types(default, default) : Bool;
+ public var not_review_status(default, default) : Bool;
public function new(?_original_text_types : Array<OriginalFlag>,
?_translation_status : Array<TranslationFlag>,
@@ -51,6 +57,8 @@
date = FIRST_DATE;
original_text_types_and = false;
review_status_and = false;
+ not_original_text_types = false;
+ not_review_status = false;
}
public function setFilter(
@@ -94,6 +102,7 @@
}
}
server_filter.and_original_tags = original_text_types_and;
+ server_filter.not_original_tags = not_original_text_types;
}
if (translation_status != null && translation_status.length > 0
&& translation_status.length < Flag.translation_flags.length) {
@@ -108,6 +117,7 @@
server_filter.review_tags.push(Flag.reviewFlagToString(flag));
}
server_filter.and_review_tags = review_status_and;
+ server_filter.not_review_tags = not_review_status;
}
if (original_text_string != '') {
server_filter.original_text_string = original_text_string;
Modified: Sources/TranstoolClient/Models/User.hx
===================================================================
--- Sources/TranstoolClient/Models/User.hx 2006-11-24 09:27:07 UTC (rev 512)
+++ Sources/TranstoolClient/Models/User.hx 2006-11-24 13:49:57 UTC (rev 513)
@@ -1,7 +1,6 @@
package models;
import communications.TranstoolConnection;
-import models.UserDomain;
import models.Language;
class User {
@@ -42,7 +41,6 @@
TranstoolConnection.getServer().loadUser(_id, user.onLoad);
return user;
}
-
// copy new user data
public function copy (_user : User) {
Deleted: Sources/TranstoolClient/Models/UserDomain.hx
===================================================================
--- Sources/TranstoolClient/Models/UserDomain.hx 2006-11-24 09:27:07 UTC (rev 512)
+++ Sources/TranstoolClient/Models/UserDomain.hx 2006-11-24 13:49:57 UTC (rev 513)
@@ -1,13 +0,0 @@
-package models;
-
-
-class UserDomain {
-
- public var id_user (default, null) : Int;
- public var id_domain (default, null) : Int;
-
- public function new (id_user : Int , id_domain : Int) {
- this.id_user = id_user;
- this.id_domain = id_domain;
- }
-}
\ No newline at end of file