opendev/gerrit
Code Issues Proposed changes

Merge "Add user preference to disable showing size bars in change tables"

Browse Source
This commit is contained in:
Edwin Kempin
2013-12-07 06:37:58 +00:00
committed by Gerrit Code Review
parent 1768cada53 13e03a7631
commit bdb3d452f6
9 changed files with 83 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.java
View File

@@ -38,6 +38,7 @@ public interface AccountConstants extends Constants {
String showUsernameInReviewCategory();
String buttonSaveChanges();
String showRelativeDateInChangeTable();
String showSizeBarInChangeTable();
String changeScreenOldUi();
String changeScreenNewUi();

3
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
View File

@@ -17,7 +17,8 @@ diffViewLabel = Diff View (New Change Screen):
dateFormatLabel = Date/Time Format:
contextWholeFile = Whole File
buttonSaveChanges = Save Changes
showRelativeDateInChangeTable = Show Relative Dates in Changes Table
showRelativeDateInChangeTable = Show Relative Dates In Changes Table
showSizeBarInChangeTable = Show Change Sizes As Colored Bars In Changes Table
changeScreenOldUi = Old Screen
changeScreenNewUi = New Screen

12
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPreferencesScreen.java
View File

@@ -45,6 +45,7 @@ public class MyPreferencesScreen extends SettingsScreen {
private CheckBox reversePatchSetOrder;
private CheckBox showUsernameInReviewCategory;
private CheckBox relativeDateInChangeTable;
private CheckBox sizeBarInChangeTable;
private ListBox maximumPageSize;
private ListBox dateFormat;
private ListBox timeFormat;
@@ -136,8 +137,9 @@ public class MyPreferencesScreen extends SettingsScreen {
}
relativeDateInChangeTable = new CheckBox(Util.C.showRelativeDateInChangeTable());
sizeBarInChangeTable = new CheckBox(Util.C.showSizeBarInChangeTable());
final Grid formGrid = new Grid(11, 2);
final Grid formGrid = new Grid(12, 2);
int row = 0;
formGrid.setText(row, labelIdx, "");
@@ -172,6 +174,10 @@ public class MyPreferencesScreen extends SettingsScreen {
formGrid.setText(row, labelIdx, "");
formGrid.setWidget(row, fieldIdx, relativeDateInChangeTable);
row++;
formGrid.setText(row, labelIdx, "");
formGrid.setWidget(row, fieldIdx, sizeBarInChangeTable);
row++;
}
formGrid.setText(row, labelIdx, Util.C.commentVisibilityLabel());
@@ -208,6 +214,7 @@ public class MyPreferencesScreen extends SettingsScreen {
e.listenTo(dateFormat);
e.listenTo(timeFormat);
e.listenTo(relativeDateInChangeTable);
e.listenTo(sizeBarInChangeTable);
e.listenTo(commentVisibilityStrategy);
e.listenTo(changeScreen);
e.listenTo(diffView);
@@ -233,6 +240,7 @@ public class MyPreferencesScreen extends SettingsScreen {
dateFormat.setEnabled(on);
timeFormat.setEnabled(on);
relativeDateInChangeTable.setEnabled(on);
sizeBarInChangeTable.setEnabled(on);
commentVisibilityStrategy.setEnabled(on);
changeScreen.setEnabled(on);
diffView.setEnabled(on);
@@ -250,6 +258,7 @@ public class MyPreferencesScreen extends SettingsScreen {
setListBox(timeFormat, AccountGeneralPreferences.TimeFormat.HHMM_12, //
p.getTimeFormat());
relativeDateInChangeTable.setValue(p.isRelativeDateInChangeTable());
sizeBarInChangeTable.setValue(p.isSizeBarInChangeTable());
setListBox(commentVisibilityStrategy,
AccountGeneralPreferences.CommentVisibilityStrategy.EXPAND_RECENT,
p.getCommentVisibilityStrategy());
@@ -327,6 +336,7 @@ public class MyPreferencesScreen extends SettingsScreen {
AccountGeneralPreferences.TimeFormat.HHMM_12,
AccountGeneralPreferences.TimeFormat.values()));
p.setRelativeDateInChangeTable(relativeDateInChangeTable.getValue());
p.setSizeBarInChangeTable(sizeBarInChangeTable.getValue());
p.setCommentVisibilityStrategy(getListBox(commentVisibilityStrategy,
CommentVisibilityStrategy.EXPAND_RECENT,
CommentVisibilityStrategy.values()));

13
gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeTable2.java
View File

@@ -236,9 +236,16 @@ public class ChangeTable2 extends NavigationTable<ChangeInfo> {
}
int col = C_SIZE;
if (useNewFeatures) {
table.setWidget(row, col, getSizeWidget(c));
fmt.getElement(row, col).setTitle(
Util.M.insertionsAndDeletions(c.insertions(), c.deletions()));
if (Gerrit.isSignedIn()
&& !Gerrit.getUserAccount().getGeneralPreferences()
.isSizeBarInChangeTable()) {
table.setText(row, col,
Util.M.insertionsAndDeletions(c.insertions(), c.deletions()));
} else {
table.setWidget(row, col, getSizeWidget(c));
fmt.getElement(row, col).setTitle(
Util.M.insertionsAndDeletions(c.insertions(), c.deletions()));
}
col++;
}