Merge origin/master

This commit is contained in:
Jindra Petřík
2016-02-24 21:19:27 +01:00
4 changed files with 28 additions and 14 deletions

View File

@@ -2836,15 +2836,15 @@ public final class SWF implements SWFContainerItem, Timelined {
timelined.setModified(true);
timelined.resetTimeline();
} else // timeline should be always the swf here
if (removeDependencies) {
removeTagWithDependenciesFromTimeline(tag, timelined.getTimeline());
if (removeDependencies) {
removeTagWithDependenciesFromTimeline(tag, timelined.getTimeline());
timelined.setModified(true);
} else {
boolean modified = removeTagFromTimeline(tag, timelined.getTimeline());
if (modified) {
timelined.setModified(true);
} else {
boolean modified = removeTagFromTimeline(tag, timelined.getTimeline());
if (modified) {
timelined.setModified(true);
}
}
}
}
@Override
@@ -2875,6 +2875,7 @@ public final class SWF implements SWFContainerItem, Timelined {
public void addTag(Tag tag) {
setModified(true);
tags.add(tag);
updateCharacters();
}
/**
@@ -2887,6 +2888,7 @@ public final class SWF implements SWFContainerItem, Timelined {
public void addTag(int index, Tag tag) {
setModified(true);
tags.add(index, tag);
updateCharacters();
}
/**
@@ -2900,6 +2902,7 @@ public final class SWF implements SWFContainerItem, Timelined {
int index = tags.indexOf(oldTag);
if (index != -1) {
tags.set(index, newTag);
updateCharacters();
}
}

View File

@@ -178,6 +178,14 @@ public class MainFrameRibbonMenu extends MainFrameMenu {
historyButton.setHorizontalAlignment(SwingUtilities.LEFT);
openHistoryPanel.addButtonToLastGroup(historyButton);
}
if (recentFiles.isEmpty()) {
JCommandButton emptyLabel = new JCommandButton(translate("menu.recentFiles.empty"));
emptyLabel.setHorizontalAlignment(SwingUtilities.LEFT);
emptyLabel.setEnabled(false);
openHistoryPanel.addButtonToLastGroup(emptyLabel);
}
openHistoryPanel.setMaxButtonColumns(1);
targetPanel.setLayout(new BorderLayout());
targetPanel.add(openHistoryPanel, BorderLayout.CENTER);

View File

@@ -104,8 +104,8 @@ config.description.openFolderAfterFlaExport = A kimeneti k\u00f6nyvt\u00e1r megn
config.name.useDetailedLogging = R\u00e9szletes napl\u00f3z\u00e1s
config.description.useDetailedLogging = R\u00e9szletes hiba\u00fczenetek \u00e9s inform\u00e1ci\u00f3k napl\u00f3z\u00e1sa hibakeres\u00e9ssi c\u00e9lb\u00f3l
config.name.debugMode = Hibakeres\u00e9si m\u00f3d
config.description.debugMode = M\u00f3d a hibakeres\u00e9shez. Bekapcsolja a hibakeres\u00e9si men\u00fct.
config.name._debugMode = FFDec hibakeres\u00e9si m\u00f3dban
config.description._debugMode = M\u00f3d az FFDec hibakeres\u00e9s\u00e9hez. Bekapcsolja a hibakeres\u00e9si men\u00fct. Ennek nincs k\u00f6ze a hibakeres\u00e9s funkci\u00f3hoz.
config.name.resolveConstants = \u00c1lland\u00f3k felold\u00e1sa AS1/2 p-k\u00f3d eset\u00e9n
config.description.resolveConstants = Kapcsolja ezt ki a 'constantxx' \u00e9rt\u00e9kek mutat\u00e1s\u00e1hoz a val\u00f3s \u00e9rt\u00e9kek helyett a P-k\u00f3d ablakban
@@ -125,8 +125,8 @@ config.description.paramNamesEnable = Param\u00e9ter nevek haszn\u00e1lata a vis
config.name.displayFileName = SWF n\u00e9v mutat\u00e1sa a c\u00edmsorban
config.description.displayFileName = SWF f\u00e1jl/url n\u00e9v mutat\u00e1sa az ablak c\u00edmsor\u00e1ban (Ut\u00e1na k\u00e9sz\u00edthet k\u00e9perny\u0151k\u00e9peket)
config.name.debugCopy = \u00dajraford\u00edt\u00e1s hibakeres\u00e9s
config.description.debugCopy = Megpr\u00f3b\u00e1lja \u00fajraford\u00edtani az SWF f\u00e1jlt megnyit\u00e1s ut\u00e1n hogy megbizonyosodjon arr\u00f3l, hogy ugyanazt a bin\u00e1ris k\u00f3dot \u00e1ll\u00edtja el\u0151. Csak HIBAKERES\u00c9SHEZ haszn\u00e1lja!
config.name._debugCopy = \u00dajraford\u00edt\u00e1sos hibakeres\u00e9s FFDec-ben
config.description._debugCopy = Megpr\u00f3b\u00e1lja \u00fajraford\u00edtani az SWF f\u00e1jlt megnyit\u00e1s ut\u00e1n hogy megbizonyosodjon arr\u00f3l, hogy ugyanazt a bin\u00e1ris k\u00f3dot \u00e1ll\u00edtja el\u0151. Csak FFDec HIBAKERES\u00c9SHEZ haszn\u00e1lja!
config.name.dumpTags = Tagek ki\u00edr\u00e1sa a parancssorra
config.description.dumpTags = Tagek ki\u00edr\u00e1sa a parancssorra az SWF f\u00e1jl olvas\u00e1sakor
@@ -323,8 +323,8 @@ config.description.autoSaveTagModifications = V\u00e1ltoz\u00e1sok ment\u00e9se
config.name.saveSessionOnExit = Munkamenet ment\u00e9se kil\u00e9p\u00e9skor
config.description.saveSessionOnExit = Elmenti az aktu\u00e1lis munkamenetet \u00e9s vissza\u00e1ll\u00edtja azt az FFDec \u00fajraind\u00edt\u00e1sa ut\u00e1n (csak igazi f\u00e1jlokkal m\u0171k\u00f6dik)
config.name.showDebugMenu = Hibakeres\u00e9si men\u00fc mutat\u00e1sa
config.description.showDebugMenu = Hibakeres\u00e9si men\u00fc mutat\u00e1sa a szalagon
config.name._showDebugMenu = FFDec hibakeres\u00e9si men\u00fc mutat\u00e1sa
config.description._showDebugMenu = Hibakeres\u00e9si men\u00fc mutat\u00e1sa a szalagon a visszaford\u00edt\u00f3 hibakeres\u00e9s\u00e9hez.
config.name.allowOnlyOneInstance = Csak egy FFDec p\u00e9ld\u00e1ny enged\u00e9lyez\u00e9se (Csak Windows OS-en)
config.description.allowOnlyOneInstance = FFDec csak egy p\u00e9ld\u00e1nyban futhat, minden f\u00e1jl egy ablakban lesz megnyitva. Csak Windows oper\u00e1ci\u00f3s rendszeren m\u0171k\u00f6dik.

View File

@@ -708,4 +708,7 @@ message.imported.swf.manually = Cannot load imported SWF\n%url%\nThe file or URL
message.warning.hexViewNotUpToDate = Hex View is not up-to-date. Please save and reload the file to update Hex View.
message.font.replace.updateTexts = Some characters were replaced. Do you want to update the existing texts?
menu.settings.simplifyExpressions = Simplify expressions
menu.settings.simplifyExpressions = Simplify expressions
#after 8.0.1
menu.recentFiles.empty = Recent file list is empty