PDF: hand tool on main toolbar

dipu-bd · Jun 19, 2017 · 9307f11 · 9307f11
1 parent 1169c7c
commit 9307f11
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 28 deletions.
diff --git a/UVA Arena/UVA Arena.v12.suo b/UVA Arena/UVA Arena.v12.suo
diff --git a/UVA Arena/UVA Arena/Pages/CODES.cs b/UVA Arena/UVA Arena/Pages/CODES.cs
@@ -1468,6 +1468,7 @@ private void expandCollapseButton_Click(object sender, EventArgs e)
         {
             if(showProblemButton.Tag == null)
             {
+                problemToolButton.PerformClick();
                 mainContainer.Panel1.Controls.Add(Interactivity.problemViewer.pdfViewer1);
                 Interactivity.problemViewer.pdfViewer1.BringToFront();
                 mainContainer.SplitterDistance = mainContainer.Width * 9 / 19;

diff --git a/UVA Arena/UVA Arena/Pages/ProblemViewer.Designer.cs b/UVA Arena/UVA Arena/Pages/ProblemViewer.Designer.cs
diff --git a/UVA Arena/UVA Arena/Pages/ProblemViewer.cs b/UVA Arena/UVA Arena/Pages/ProblemViewer.cs
@@ -85,11 +85,13 @@ private void setPdfFile(string file)
             if(file == null)
             {
                 pdfViewer1.Visible = false;
+                downloadingNoticeLabel.Visible = true;
             }
             else
             {
                 pdfViewer1.Load(file);
                 pdfViewer1.Visible = true;
+                downloadingNoticeLabel.Visible = false;
             }
         }
 

diff --git a/UVA Arena/UVA Arena/UVA Arena.csproj b/UVA Arena/UVA Arena/UVA Arena.csproj
@@ -28,7 +28,7 @@
     <SupportUrl>https://github.com/dipu-bd/UVA-Arena</SupportUrl>
     <ProductName>UVA Arena</ProductName>
     <PublisherName>Sudipto Chandra</PublisherName>
-    <ApplicationRevision>74</ApplicationRevision>
+    <ApplicationRevision>75</ApplicationRevision>
     <ApplicationVersion>1.8.2.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>

diff --git a/UVA Arena/UVA Arena/pdf.js/web/viewer.css b/UVA Arena/UVA Arena/pdf.js/web/viewer.css
@@ -1235,7 +1235,7 @@ html[dir="rtl"] .secondaryToolbarButton > span {
   content: url(images/secondaryToolbarButton-rotateCw.png);
 }
 
-.secondaryToolbarButton.handTool::before {
+.handTool::before {
   content: url(images/secondaryToolbarButton-handTool.png);
 }
 

diff --git a/UVA Arena/UVA Arena/pdf.js/web/viewer.html b/UVA Arena/UVA Arena/pdf.js/web/viewer.html
@@ -95,11 +95,11 @@
 
         <div id="secondaryToolbar" class="secondaryToolbar hidden doorHangerRight">
           <div id="secondaryToolbarButtonContainer">
-            <button id="secondaryPresentationMode" class="secondaryToolbarButton presentationMode visibleLargeView" title="Switch to Presentation Mode" tabindex="51" data-l10n-id="presentation_mode">
+            <button id="secondaryPresentationMode" class="secondaryToolbarButton presentationMode visibleLargeView" title="Switch to Presentation Mode" tabindex="51" data-l10n-id="presentation_mode" hidden>
               <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
             </button>
 
-            <button id="secondaryOpenFile" class="secondaryToolbarButton openFile visibleLargeView" title="Open File" tabindex="52" data-l10n-id="open_file">
+            <button id="secondaryOpenFile" class="secondaryToolbarButton openFile visibleLargeView" title="Open File" tabindex="52" data-l10n-id="open_file" hidden>
               <span data-l10n-id="open_file_label">Open</span>
             </button>
 
@@ -111,7 +111,7 @@
               <span data-l10n-id="download_label">Download</span>
             </button>
 
-            <a href="#" id="secondaryViewBookmark" class="secondaryToolbarButton bookmark visibleSmallView" title="Current view (copy or open in new window)" tabindex="55" data-l10n-id="bookmark">
+            <a href="#" id="secondaryViewBookmark" class="secondaryToolbarButton bookmark visibleSmallView" title="Current view (copy or open in new window)" tabindex="55" data-l10n-id="bookmark" hidden>
               <span data-l10n-id="bookmark_label">Current View</span>
             </a>
 
@@ -135,12 +135,6 @@
 
             <div class="horizontalToolbarSeparator"></div>
 
-            <button id="toggleHandTool" class="secondaryToolbarButton handTool" title="Enable hand tool" tabindex="60" data-l10n-id="hand_tool_enable">
-              <span data-l10n-id="hand_tool_enable_label">Enable hand tool</span>
-            </button>
-
-            <div class="horizontalToolbarSeparator"></div>
-
             <button id="documentProperties" class="secondaryToolbarButton documentProperties" title="Document Properties…" tabindex="61" data-l10n-id="document_properties">
               <span data-l10n-id="document_properties_label">Document Properties…</span>
             </button>
@@ -179,10 +173,15 @@
                   <span data-l10n-id="open_file_label">Open</span>
                 </button>
 
+                <button id="toggleHandTool" class="toolbarButton handTool" title="Enable hand tool" tabindex="32" data-l10n-id="hand_tool_enable">
+                    <span data-l10n-id="hand_tool_enable_label">Enable hand tool</span>
+                </button>
+
                 <button id="print" class="toolbarButton print hiddenMediumView" title="Print" tabindex="33" data-l10n-id="print">
                   <span data-l10n-id="print_label">Print</span>
                 </button>
 
+
                 <button id="download" class="toolbarButton download hiddenMediumView" title="Download" tabindex="34" data-l10n-id="download">
                   <span data-l10n-id="download_label">Download</span>
                 </button>