Skip to content

Commit

Permalink
Work on #3255
Browse files Browse the repository at this point in the history
  • Loading branch information
@niksedk
niksedk committed Dec 29, 2018
1 parent 7fe3856 commit b797ba0
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 66 deletions.
1 change: 1 addition & 0 deletions src/Forms/Main.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

106 changes: 53 additions & 53 deletions src/Forms/Main.cs
View file
Expand Up @@ -23633,69 +23633,69 @@ private void pictureBoxBookmark_MouseClick(object sender, MouseEventArgs e)
}
}
}
else if (e.Button == MouseButtons.Right)
{
if (_bookmarkContextMenu == null)
{
_bookmarkContextMenu = new ContextMenu();
}

// edit bookmark
var menuItem = new MenuItem(Configuration.Settings.Language.Main.Menu.ContextMenu.EditBookmark);
menuItem.Click += (sender2, e2) =>
{
var p1 = _subtitle.GetParagraphOrDefault(_subtitleListViewIndex);
if (p1 != null)
{
using (var form = new BookmarkAdd(p1))
{
var result = form.ShowDialog(this);
if (result == DialogResult.OK)
{
p1.Bookmark = form.Comment;
SubtitleListview1.ShowState(_subtitleListViewIndex, p1);
ShowHideBookmark(p1);
SubtitleListview1.StateImageList = _subtitle != null && _subtitle.Paragraphs.Any(p => p.Bookmark != null) ? imageListBookmarks : null;
}
}
}
};
_bookmarkContextMenu.MenuItems.Add(menuItem);
private void pictureBoxBookmark_MouseEnter(object sender, EventArgs e)
{
if (_bookmarkContextMenu != null)
return;


_bookmarkContextMenu = new ContextMenu();

// remove bookmark
menuItem = new MenuItem(Configuration.Settings.Language.Main.Menu.ContextMenu.RemoveBookmark);
menuItem.Click += (sender2, e2) =>
// edit bookmark
var menuItem = new MenuItem(Configuration.Settings.Language.Main.Menu.ContextMenu.EditBookmark);
menuItem.Click += (sender2, e2) =>
{
var p1 = _subtitle.GetParagraphOrDefault(_subtitleListViewIndex);
if (p1 != null)
{
using (var form = new BookmarkAdd(p1))
{
var p2 = _subtitle.GetParagraphOrDefault(_subtitleListViewIndex);
if (p2 != null)
var result = form.ShowDialog(this);
if (result == DialogResult.OK)
{
p2.Bookmark = null;
SubtitleListview1.ShowState(_subtitleListViewIndex, p2);
ShowHideBookmark(p2);
p1.Bookmark = form.Comment;
SubtitleListview1.ShowState(_subtitleListViewIndex, p1);
ShowHideBookmark(p1);
SubtitleListview1.StateImageList = _subtitle != null && _subtitle.Paragraphs.Any(p => p.Bookmark != null) ? imageListBookmarks : null;
}
};
_bookmarkContextMenu.MenuItems.Add(menuItem);
}
}
};
_bookmarkContextMenu.MenuItems.Add(menuItem);

// remove bookmark
menuItem = new MenuItem(Configuration.Settings.Language.Main.Menu.ContextMenu.RemoveBookmark);
menuItem.Click += (sender2, e2) =>
{
var p2 = _subtitle.GetParagraphOrDefault(_subtitleListViewIndex);
if (p2 != null)
{
p2.Bookmark = null;
SubtitleListview1.ShowState(_subtitleListViewIndex, p2);
ShowHideBookmark(p2);
SubtitleListview1.StateImageList = _subtitle != null && _subtitle.Paragraphs.Any(p => p.Bookmark != null) ? imageListBookmarks : null;
}
};
_bookmarkContextMenu.MenuItems.Add(menuItem);

_bookmarkContextMenu.MenuItems.Add("-");
_bookmarkContextMenu.MenuItems.Add("-");

// go to bookmark
menuItem = new MenuItem(Configuration.Settings.Language.Settings.GoToBookmark);
menuItem.Click += (sender2, e2) => { GoToBookmark(); };
_bookmarkContextMenu.MenuItems.Add(menuItem);
// go to bookmark
menuItem = new MenuItem(Configuration.Settings.Language.Settings.GoToBookmark);
menuItem.Click += (sender2, e2) => { GoToBookmark(); };
_bookmarkContextMenu.MenuItems.Add(menuItem);

// clear all bookmarks
menuItem = new MenuItem(Configuration.Settings.Language.Settings.ClearBookmarks);
menuItem.Click += (sender2, e2) => { ClearBookmarks(); };
_bookmarkContextMenu.MenuItems.Add(menuItem);
// clear all bookmarks
menuItem = new MenuItem(Configuration.Settings.Language.Settings.ClearBookmarks);
menuItem.Click += (sender2, e2) =>
{
ClearBookmarks();
};
_bookmarkContextMenu.MenuItems.Add(menuItem);

pictureBoxBookmark.ContextMenu = _bookmarkContextMenu;
_bookmarkContextMenu.Show(pictureBoxBookmark, new Point(pictureBoxBookmark.Width - 3, pictureBoxBookmark.Height - 3));
}
else
{
_bookmarkContextMenu.Show(pictureBoxBookmark, new Point(Cursor.Position.X - 3, Cursor.Position.Y - 3));
}
}
pictureBoxBookmark.ContextMenu = _bookmarkContextMenu;
}
}
}
Expand Down
26 changes: 13 additions & 13 deletions src/Forms/Main.resx
View file
Expand Up @@ -463,18 +463,18 @@
<value>
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
AABJRU5ErkJggg==
</value>
</data>
Expand Down Expand Up @@ -771,7 +771,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
CAAAAk1TRnQBSQFMAgEBAgEAAWgBJQFoASUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAXABJQFwASUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
Expand Down

0 comments on commit b797ba0

Please sign in to comment.